Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html

Fix push event.

Fixes issue with !653.

See merge request !663

Fix reference links in dashboard activity and ATOM feeds.

References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations.

This MR passes the project in question to the reference parsers in an option.

cc @rspeicher

See merge request !653

Spin icon next to "Checking for CI status..."

Stationary spinners make me sad.

See merge request !655

Use count badges with number_with_delimiter helper for issue, commit count

See merge request !658

Fix bug with default timezone en RSS gitlab events

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Add order option for projects API

https://dev.gitlab.org/gitlab/gitlab-ci/issues/222

See merge request !656

Refactor SessionsController to use a controller concern

See merge request !659

Enable 2FA for LDAP logins

See merge request !395

Fix broken view when viewing history of a file that includes a path that used to be another file

Requires gitlab_git to v7.1.12 to be tagged and released.

Closes #1598

See merge request !651

Add style for <kbd> element in markdown

Fixes #5825

Use slightly fewer icons in project sidebar.

![Screen_Shot_2015-05-14_at_17.01.37](https://gitlab.com/gitlab-org/gitlab-ce/uploads/57928b7a0beb556f1e779d340b5e124f/Screen_Shot_2015-05-14_at_17.01.37.png)

See merge request !657

Minor RelativeLinkFilter cleanup

See merge request !649

Protect OmniAuth request phase against CSRF.

Addresses #2268.

See merge request !1793

Fix mentioning of private groups.

`issue.participants` would mistakenly not send the `current_user` to `mentioned_users`, which means it would search for referenced groups and users as if the user was signed out. Since signed out users don't have access to private groups (groups without public projects) and since you can't reference a group you don't have access to (since this would leak its existence), the group reference wasn't found and the group members weren't notified.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2326.

See merge request !654

Always show note action icons.

As discussed in #639.

The delete icon becomes red on hover, the edit one becomes slightly darker.

The "Link here" icon has been removed, and the link to the specific comment can now be found by clicking the post date ("3 months ago"), which is most other sites do it as well.

![Screen_Shot_2015-05-14_at_12.18.50](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a204fa3a042659fa53fcb70d7143c8d1/Screen_Shot_2015-05-14_at_12.18.50.png)

See merge request !652

Use apt repositories to upgrade Docker images to the latest versions

Reduces the need to bump versions periodically.

See merge request !647

Closes #1598