# Conflicts:
#	app/assets/stylesheets/pages/projects.scss
#	app/views/admin/application_settings/_form.html.haml
#	db/schema.rb

[ci skip]

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

Prevent overflow of long instance urls during Project creation

Closes #42037

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

CE upstream - 2018-03-21 21:28 UTC

Closes gitlab-runner#1621 and gitaly#1092

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

`foreign_key_exists?` was changed upstream; this migration doesn't need to
define its own version any more.

Introduce latest security changes to `master` EE

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

Introduce latest security changes to `master`

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

Resolve "Performance bar modal box content overflows"

Closes #44453

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

Add image for clearing the cache docs

Closes gitlab-ee#4642

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

Remove calls to clear_cache from Git::Wiki

Closes gitaly#1095

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

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/4642

Fix CI Jobs retry link

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

# Conflicts:
#   Gemfile
#   Gemfile.lock

Speed Up Pipeline Creation

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

# Conflicts:
#   app/assets/javascripts/performance_bar/components/detailed_metric.vue

Remove full_namespace_format_regex because it's not used

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

Move email footer info to a single line

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

Move email footer info to a single line -- EE merge edition

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

Break utils functions for security issues

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

Fix performance bar spacing

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

Fix "A copy of Gitlab::Middleware::Readonly has been removed from the module

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

OmniauthInitializer created to allow testing/refactoring of code from devise.rb

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

Beside that it's using the same instance variable with
`namespace_format_regex` which is going to cause issues.

[ci skip]

[ci skip]

[ci skip]

Fix "A copy of Gitlab::Middleware::Readonly has been removed from the module tree but is still active"

Similar to #34047 and #29327

Geo - Avoid rescheduling the same project again in a backfill condition

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

Add query counts by model to profiler output

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

Disables the button when submitting comment.

Closes #39661

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