# Conflicts:
#	doc/ci/examples/browser_performance.md

[ci skip]

Merge branch '5431-geo-pagesdomainverificationworker-can-start-up-on-secondaries-if-db-is-down' into 'master'

Resolve "Geo: PagesDomainVerificationWorker can start up on secondaries if DB is down"

Closes #5431

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

Do not retry package-and-qa manual action on failure

Closes #44882

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

`overlay2` is more recent and stable than `overlay`

CE upstream - 2018-04-02 21:40 UTC

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

Geo: Migrate CI artifacts into their own registry table

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

Replace the `project/issues/issues.feature` spinach test with an rspec analog

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

Move Sidekiq exporter logs to log/sidekiq_exporter.log

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

Replace the `project/issues/weight.feature` spinach test with an rspec analog

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

[Rails5] Isolate `test_after_commit` gem

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Backport missing object storage worker specs

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

Resolve "Downstream pipeline arrow is not the same height or color as the other connectors"

Closes #3572

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

Refactor the browser performance testing docs

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

Refactor the browser performance testing docs

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

# Conflicts:
#	app/views/projects/deploy_keys/_index.html.haml
#	doc/ci/pipelines.md
#	doc/ci/quick_start/README.md
#	doc/ci/yaml/README.md
#	spec/javascripts/boards/mock_data.js
#	spec/javascripts/vue_mr_widget/mock_data.js

[ci skip]

CE upstream - 2018-04-02 14:31 UTC

Closes #2262 and gitlab-ce#2262

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

Raise more descriptive errors when URLs are blocked

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

Resolve "Clicking confidential and lock icons on sidebar should also activate dropdown"

Closes #40907

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

Fix extra by on the mr_widget approvals body

Closes #4988

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

Add button type to settings toggle

Closes #44737

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

Add button type to settings toggle

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

Add setup instructions for setting up NFS in a typical GitLab HA cluster.

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

Update brakeman to 4.2.1

Closes #44878

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

The Sidekiq exporter logs were mixing with the normal Sidekiq logs. In order
to support structured logging in Sidekiq, we either need to split this data
out or convert the exporter to produce structured logs. Since Sidekiq job
processing is fundamentally different information from Web server traffic,
it seems cleaner to move the metrics traffic into a separate file, where they
can be parsed by a different filter if needed.

Relates to #20060