Remove trailinng comma in webpack config

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

Geo - Cleanup repository path implementation

Closes #5178

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

Updated Prettier Print Width to 100

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

Change avatar error message to include allowed file formats

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

Geo: Document @geo-temporary directory

Closes #5349

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

Route path lookups through legacy_disk_path (EE version)

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

Rename modal.vue to deprecated_modal.vue (EE port)

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

EE port of UX re-design branch items with flexbox

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

EE Add read-only banner to all pages

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

CE upstream - 2018-03-22 14:48 UTC

Closes #4642 and gitaly#1095

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

Resolve "Snippets uploads fails when background upload is enabled"

Closes #5307

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

Refactor object storage for CE

Closes #4952, #4928, #4980, #4915, #4879, #4171, #4163, #3370, #2841, and gitlab-ce#29203

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

EE port of prettier-ignore

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

When the database is in a read-only state, display a banner on each
page informing the user they cannot write to that GitLab instance.

EE counterpart of gitlab-org/gitlab-ce!17798.

[Geo] Add storage version to logs

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

Resolve "Add issue weight indicator on the issue cards in the issue board"

Closes #4006

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

# 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.