In EE, the DeployKeyController reloads the user's accesible key so that
it can audit changes. However, this has a side effect of preventing
admins from deleting keys in the interface.  Note that the deletion
problem does not happen in CE because auditing is not performed there.

We can clean up the code by reusing the key that was created or destroyed
and pushing the logic into the service.

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

CE upstream - 2018-11-13 01:21 UTC

Closes gitlab-org/quality/team-tasks#24

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

CE upstream - 2018-11-13 00:21 UTC

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

Improve the 'Testing levels' documentation

Closes gitlab-org/quality/team-tasks#24

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

CE upstream - 2018-11-12 21:21 UTC

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

Align all avatars and system notes in discussion

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

# Conflicts:
#	app/services/issues/move_service.rb

[ci skip]

CE upstream - 2018-11-12 20:21 UTC

Closes gitlab-ce#53180 and #8397

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

Refactoring Issues::MoveService (port of promote epics)

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

Extract code from Issues::MoveService

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

Fix tags for environments

Closes gitlab-ee#8397

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

Make sure there's only one slash as path separator

Closes #53180

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

Make sure there's only one slash as path separator

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

This reverts commit c739b8e0.

CE upstream - 2018-11-12 18:21 UTC

Closes gitlab-ce#53853

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

Fix MergeRequestService erroring out on deleted branch

Closes #53853

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

CE upstream - 2018-11-12 16:21 UTC

Closes gitlab-ce#53781

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

Disable CODEOWNERS for the time being

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

When a branch is deleted, the push commit IDs is an empty array.
The previous change would attempt to call `[].exists?`, which is
invalid. Fix this by returning `MergeRequestDiffCommit.none` instead.

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

Removes feature flag for ciEnvironmentsStatusChanges

Closes #52937

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

We can move the file back to its original location once https://gitlab.com/gitlab-org/gitlab-ee/issues/8396 is fixed.

# Conflicts:
#	.gitlab-ci.yml
#	doc/user/markdown.md

[ci skip]

CE upstream - 2018-11-12 10:21 UTC

Closes #8390

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

Bump redis-store to 1.6.0

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

Bump mime-types to 3.2.2

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