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

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

# 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

[EE] Comment on any expanded diff line on MRs (with feature-flag)

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

Comment on any expanded diff line on MRs (with feature-flag)

Closes #13950

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

Set an empty entrypoint for license_management job

Closes #53786

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

Remove unnecessary job dependencies

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

Remove unnecessary job dependencies

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

Changed diff tree filtering to path

Closes #53781

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

Resolve "View issue button doesn't work in dashboard modal"

Closes #8370

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