# Conflicts:
#	app/assets/javascripts/boards/components/issue_card_inner.js
#	app/views/layouts/_page.html.haml
#	app/views/projects/branches/_branch.html.haml
#	config/webpack.config.js

[ci skip]

Add read-only banner to all pages

Closes #43937

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

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

Use porcelain commit lookup method on CI::CreatePipelineService

Closes charts/helm.gitlab.io#291

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

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

Added prettierignore file

Closes #44483

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

EE port of prettier-ignore

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

Disable webpack scope hoisting in development

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

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.

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.

Closes gitlab-org/gitlab-ce#43937.

UI breakdown of message of the last pushed branch for Create merge request

Closes #44382

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

Resolve "Some dropdowns have two scroll bars."

Closes #43273

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

Fix the other "A copy of ..." error for ReadOnly

Closes #44365

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

Add the /help page in robots.txt

Closes #44433

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

[Geo] Add storage version to logs

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

make a little more obvious what operations might need downtime or enhanced migration techniques

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

Same strategy with:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17810

See:
https://stackoverflow.com/a/29710188/1992201

Frankly I don't really understand how this works and I don't really
care either. However I tried it and it does the job. To try this,
make sure you have pending migrations, and run the server, hit the site.
It would tell you that there's pending migrations, and then run
migrations, and then hit the site again.

Without this patch, Rails would complain that "A copy of ...",
with this patch, it works without problems.

Poor UX with branch whose name is very long on Branches

Closes #44386

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

Backport 4006 add weight indicator to issues board

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

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]