Clarify that the Pick Into X.Y label is added after approval

See merge request gitlab-org/gitlab-ce!17636

Remove double caching of Repository#empty?

Closes #43882

See merge request gitlab-org/gitlab-ce!17588

CE upstream - 2018-03-08 00:26 UTC

Closes gitaly#1057

See merge request gitlab-org/gitlab-ee!4891

Fix link to Merge Request Coach

See merge request gitlab-org/gitlab-ce!17633

Resolve "Change Clear Runners cache UJS action to an API request"

Closes #43770

See merge request gitlab-org/gitlab-ce!17466

Add missing delete method in mattermost session

Closes #37367 and #40660

See merge request gitlab-org/gitlab-ce!16209

Resolved using the master version. Since I believe the conflicts just
originated from a backport.

(EE-Port) Allow maintainers to push forks of a project for branches that have open MRs

See merge request gitlab-org/gitlab-ee!4885

Since now we're setting the auhtor in the `MergeRequest::BuildService`

We now need to check if the user does not have access to the pipeline
through a merge request that allows maintainer access

When a project is not private, and the source branch not protected the
user can now select the option to allow maintainers to push to this
branch.

This flag will allow maintainers of a project to push to specific
branches of a fork of a project

Custom Metrics backend and UI for creating and editing queries

See merge request gitlab-org/gitlab-ee!3799

Backport changes from introducing GithubService interation in EE

See merge request gitlab-org/gitlab-ce!17607

Geo - Repository verification on secondary node

See merge request gitlab-org/gitlab-ee!4749

Fix failure in ee/spec/services/ci_cd/github_setup_service_spec.rb

See merge request gitlab-org/gitlab-ee!4890

# Conflicts:
#	Gemfile.lock
#	app/models/members/project_member.rb
#	app/views/import/github/new.html.haml
#	db/schema.rb
#	doc/api/merge_requests.md
#	locale/gitlab.pot
#	spec/policies/project_policy_spec.rb

[ci skip]

Don't delete todos or unassign issues and MRs when a user leaves a project

Closes #43899

See merge request gitlab-org/gitlab-ce!17615

[EE] Don't delete todos or unassign issues and MRs when a user leaves a project

See merge request gitlab-org/gitlab-ee!4889

Port changes from EE: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4885 (Maintainer push to fork)

See merge request gitlab-org/gitlab-ce!17629

Removes confusing/unnecessary checkboxes when trying to configure an
integration. If there is only one supported event we don't need to
allow these to be individually disabled since the integration can be
disabled instead.

E.g. Project Integrations for GitHub, Bugzilla, Asana, Pipeline emails and Gemnasium

Allows integrations to override which triggers are configurable