# Conflicts:
#	app/assets/javascripts/boards/index.js
#	app/assets/javascripts/boards/models/list.js
#	app/assets/javascripts/boards/stores/boards_store.js
#	spec/javascripts/boards/mock_data.js

[ci skip]

Prettify all the things (part 5)

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

Prettify all the things (part 2)

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

CE upstream - 2018-10-10 14:21 UTC

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

Merge branch '52103-dropzone-css-is-failing-to-load-on-rspec-dev-and-staging-11-4-0-rc' into 'master'

Resolve "Dropzone css is failing to load on rspec, dev and staging 11.4.0 RC"

Closes #52103

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

EE Port of "Convert remaining issue board components into ES module syntax"

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

Convert remaining issue board components into ES module syntax

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

MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7865

QA: Retry registration before failing

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

[QA] Fix a wrong constant name

Closes gitlab-org/quality/nightly#22

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

Add allowance to merge feature flags MRs

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

Add `TOP_UPSTREAM_SOURCE_SHA` in `scripts/trigger-build`

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

[QA] Fix a wrong constant name

Closes gitlab-org/quality/nightly#22

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

Enhance and test JSON schema for deployments

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

Merge branch '7197-remove-can-primary-connect-to-secondary-check-from-gitlab-geo-check' into 'master'

Geo: Remove connectivity check from primary to secondary from gitlab:geo:check rake task

Closes #7197

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

# Conflicts:
#	app/controllers/admin/health_check_controller.rb
#	app/models/application_setting.rb
#	db/schema.rb
#	doc/administration/monitoring/prometheus/gitlab_metrics.md
#	doc/api/settings.md
#	locale/gitlab.pot

[ci skip]

Registration intermittently fails without an obvious cause.
The action to click the button seems to move focus to the right button
but nothing happens.
This change attempts to retry the action under the assumption that
Capybara or Chrome is misbehaving.
It also updates the selectors for the sign up page.

Fix broken link and file improvements

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

After the 7th it is OK to merge code changes that are merged as long it
is behind a feature flag.

Add in review specifics

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

The Menu namespace was changed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22115 and
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7799.

Fixes https://gitlab.com/gitlab-org/quality/nightly/issues/22.
Signed-off-by: Rémy Coutable <remy@rymai.me>

The Menu namespace was changed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22115 and
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7799.

Fixes https://gitlab.com/gitlab-org/quality/nightly/issues/22.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Remove Git circuit breaker

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

Remove Git circuit breaker

Closes #45405

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

CE upstream - 2018-10-10 11:21 UTC

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

Remove security report summary from pipelines view

Closes gitlab-ce#48031 and #7631

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

Backport of CE changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7844

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

Decouple Security Reports Modal from Store

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

CE upstream - 2018-10-10 09:21 UTC

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

Make the variable names consistent by following the
`TOP_UPSTREAM_SOURCE_*` pattern.
Signed-off-by: Rémy Coutable <remy@rymai.me>

This is needed because `GITLAB_VERSION` has a special meaning in
`omnibus-gitlab` triggers: this is the GitLab version to build.

The problem is that `omnibus-gitlab` also has triggers to run QA for an
`omnibus-gitlab` commit, and if we use `GITLAB_VERSION` in that case,
the comment would be posted on the GitLab CE/EE commit (stored in
`GITLAB_VERSION`), whci hwouldn't make any sense.
Thus we need `TOP_UPSTREAM_SOURCE_SHA` to represent the commit on
which we want to leave a comment.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Was introduced in the time that GitLab still used NFS, which is not
required anymore in most cases. By removing this, the API it calls will
return empty responses. This interface has to be removed in the next
major release, expected to be 12.0.

CE MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22212

Conflicts:
	app/controllers/admin/health_check_controller.rb
	app/controllers/application_controller.rb
	app/helpers/application_settings_helper.rb
	db/schema.rb
	doc/administration/monitoring/prometheus/gitlab_metrics.md
	doc/api/settings.md
	locale/gitlab.pot

Clarify what happens when enabling a service template

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

Update the HA NFS docs

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

Checking out to FETCH_HEAD for migration-paths-upgrade-ce-to-ee

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