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

Closes gitlab-org/quality/nightly#22

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

Add timeline icon for issue weights

Closes #7121

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

Fix disappearing weight input in Firefox

Closes #7887

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

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