Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb

Conflicts:
	CHANGELOG

Dynamic application settings in database

See merge request !1378

Packages with krb lib fix

See merge request !283

Update api messages

See merge request !1364

Conflicts:
	CHANGELOG

Refactor merge request merge service

See merge request !1374

Remove unused ex local variable from event.rb

Fix commit link on MR from fork

See merge request !1372

* Add system note when user merges MR in same way as it closes it
* Remove duplicating code

UI improvements

Improve filtering UI for next pages:

* dashboard projects page
* group milestones page
* project milestones page

See merge request !1370

chulkilee ruby 2.2.0

Merged https://github.com/gitlabhq/gitlabhq/pull/8511 into master

See merge request !1369

Merge request error display

event-last-push styling fix

When viewing a fresh install of GitLab on a mobile device after a branch with a name of sufficient length, the broken styling can be seen as follows:

![Screen Shot 2015-01-05 at 9.37.32 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/9b3ca84f1a/Screen_Shot_2015-01-05_at_9.37.32_PM.png)

I modified the css for .event-last-push and .event-last-push-text to make it look correct:

![Screen Shot 2015-01-05 at 9.37.50 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/43d5a912b3/Screen_Shot_2015-01-05_at_9.37.50_PM.png)

As this is a purely css change, I don't believe it will break any tests. The only occurrence of .event-last-push* is in ./app/views/events/_event_last_push.html.haml

See merge request !279

Forms action padding fix

The padding on the forms action is not adjusted based on screen width:

![Screen Shot 2015-01-05 at 9.48.30 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/09aa26807e/Screen_Shot_2015-01-05_at_9.48.30_PM.png)

I added a media query for .forms-action at min-width: $screen-sm-min and moved the padding-left: 17% into it:

![Screen Shot 2015-01-05 at 9.48.35 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/8bbd8eef8c/Screen_Shot_2015-01-05_at_9.48.35_PM.png)

Full width padding remains as is:

![Screen Shot 2015-01-05 at 9.53.30 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/a6232959cb/Screen_Shot_2015-01-05_at_9.53.30_PM.png)

As this is a purely css change, I don't believe it will break any tests. form-actions occur everywhere there are form actions.

See merge request !280

Dashboard icon styling fix

When viewing a fresh install of GitLab on a mobile device, the styling for the dashboard item icon is broken in such a way that if the description div is more than 100px high, its contents wrap beneath the icon as shown below.

![Screen Shot 2015-01-05 at 7.11.37 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/9ac2feca33/Screen_Shot_2015-01-05_at_7.11.37_PM.png)

I modified the css for the icon and added a new class to the description div and now it behaves as expected as shown below.

![Screen Shot 2015-01-05 at 6.56.33 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/25cf3212d2/Screen_Shot_2015-01-05_at_6.56.33_PM.png)

As this is a purely html/css change, I don't believe it will break any tests. The only occurrence of .dashboard-intro-icon is in ./app/views/dashboard/_zero_authorized_projects.html.haml

See merge request !278