CE upstream - 2018-03-26 09:28 UTC

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

Move the rest EE files from app and lib

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

Merge branch '5409-geo-recovery-from-geo-temporary-directory-doesn-t-work-if-the-namespace-directory-doesn-t-exist' into 'master'

Resolve "Geo: Recovery from @geo-temporary directory doesn't work if the namespace directory doesn't exist"

Closes #5409

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

Define a chat responder for the Slack app

Closes #5383

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

Resolve "Forking with namespace doesn't work (API)"

Closes #40798

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

Resolve "Update grape to v1.0.2 when it is released"

Closes #40843

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

Add missing changelog entries for 10.6.0

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

[ci skip]

Allow enabling External Policy Control without URL

Closes #4786

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

Make use of the prettier ignore file during our save script

Closes #44581

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

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

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

# Conflicts:
#	config/webpack.config.js

[ci skip]

CE upstream - 2018-03-23 18:25 UTC

Closes gitaly#1101, #4683, and gitlab-com/infrastructure#19

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

Fix a test that is going to break, that has not broken yet

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

Geo: Mark disabled wiki as fully synced

Closes #5427

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

Resolve "[Geo] Log JID for sync related jobs"

Closes #4994

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

[skip ci]

[Rails5] Update files by `rails app:update`

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

Fix a test that is going to break, that has not broken yet

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

Geo: Remove disabled wikis from out-of-sync queries

Closes #5361

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

When enabling this feature without a URL, all cross project features
will remain accessible and no requests will be made.

A classification label can still be specified for projects and will be
shown on all project pages.

Cleanup test for disabling comment submit button

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

Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master'

Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error"

Closes #44564

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

Merge branch 'ee-leipert-42037-long-instance-names-group-names-covers-namespace-dropdown' into 'master'

projects.scss: Fix deviation from CE and move EE only features to EE scss file.

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