Conflicts:
	Gemfile.lock

This reverts commit c217860a.

Update gitlab-linguist

Closes #1859

See merge request !1588

Web Editor: save to new branch

Implements #1931

See merge request !1523

access

Update Changelog

typo fixed

fixed a typo in an url to gitlab-ssl. Now it does not return the 404 error

Added Profile tooltip

For consistency sake, the profile in the navbar has a tooltip.

Fixes #2007

See merge request !1572

Diff headers made sticky

Trigger merge request hook when source updated

Don't cache classes in tests

Updated spring

Update charlock_holmes to 0.7.3

Improve sidebar menu for project settings

See merge request !1582

Bump gitlab-shell to 2.5.4

For #2042

See merge request !1584

LDAP users don't need to set a password to Git over HTTP.

Fixes https://github.com/gitlabhq/gitlabhq/issues/8846.

See merge request !1575

Using gitlab url to build links for gitlab issue tracker and add a spec.

Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/1107

This needs to go to master as the paths changed since rails upgrade

Fix for stable branch is in https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1574/

See merge request !1573

Make services migration more reliable

Fix for #2045 . I did not use SQL because its hard to convert SQL fields into json with interpolation and without errors. SO I just improved current migration with next:

* skip validation to prevent exception because of new `template` field in validation
* check column for existance before adding them.
  It should allow people who already failed this migration to re-run ti
* select objects with 500 batch size for better memory usage

Tested on migration from 7.0 to 7.9.0.pre

See merge request !1581

Allow non authenticated access to avatars

For #2047

cc @douwe

See merge request !1583

Using gitlab url to build links for gitlab issue tracker and add a spec. Fix rubocop warnings in path.

Ensure that people don't view the changelog on the stable branch because we don't update that one.

See merge request !1568

Improve error messages when file editing fails

Give more specific errors in API responses and web UI flash messages when a file update fails.  See #1479.

Instead of returning false from `Gitlab::Satellite::Files::EditFileAction#commit!` when a `Grit::Git::CommandFailed` error is raised, now `#commit!` raises a different error depending on whether the failure happened during checkout, commit, or push.

@dzaporozhets Please let me know if you want to change the HTTP status codes or the error messages in `Files::UpdateService`

cc @sytse

See merge request !1569

Fix ZenMode on commit show and milestone edit pages.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1110

See merge request !1557