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

Document Redis session cleanup

We used this process on gitlab.com; it may be useful for other large GitLab instances too.

See merge request !1367

Create merge request view

Updated the create merge request view to use the horizontal form layout, and added tabs for commits and changes.
Also updated commits layout to use the same as the projects commits layout.

Screenshots: [Before](https://gitlab.com/uploads/stephanvl/gitlab-ce/892d1bf4c0/Screenshot_from_2014-12-29_20_33_19.png) - [After](https://gitlab.com/uploads/stephanvl/gitlab-ce/508b3100c7/Screenshot_from_2014-12-29_20_34_40.png)

Fixes #923

See merge request !270

Create issue view

This changes the create/edit issue view, to only show the create milestone/label links if the user is allowed to create one, and puts the 'Please review the guidelines for contribution to this repository' message above the submit button.

Screenshots [Before](https://gitlab.com/uploads/stephanvl/gitlab-ce/ae2ff67f88/Screenshot_from_2014-12-29_20_43_06.png) - [After (allowed)](https://gitlab.com/uploads/stephanvl/gitlab-ce/3a4682d776/Screenshot_from_2014-12-29_20_43_29.png) - [After (not allowed)](https://gitlab.com/uploads/stephanvl/gitlab-ce/86a548d3b3/Screenshot_from_2014-12-29_20_44_00.png)

See merge request !272

Fix deleted file representation with new gitlab_git gem

Added this MR as per request from https://github.com/gitlabhq/gitlabhq/pull/7980

* Add new gitlab_gem as per gitlab-org/gitlab_git!6
* Fix the showing of deleted file, as it only displays the named of the file, rather than specifying what had happened

**Before**

![Screen Shot 2014-12-30 at 21.02.55](https://gitlab.com/uploads/arif-ali/gitlab-ce/67ec88b06d/Screen_Shot_2014-12-30_at_21.02.55.png)

**After**

![Screen Shot 2014-12-30 at 21.05.18](https://gitlab.com/uploads/arif-ali/gitlab-ce/050b689c82/Screen_Shot_2014-12-30_at_21.05.18.png)

See merge request !273

Fix xmlns:media namespacing for atom feeds

A recent commit gitlab-org/gitlab-ce@d31d711a70779132ea43387f93eb4ccc1e472761 introduced a bug that broke four of the atom feeds. The namespace for xmlns:media was not defined properly. This patch fixes the issues for all four feeds.

See merge request !274