Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110

Conflicts:
	app/assets/stylesheets/framework.scss
	app/assets/stylesheets/framework/buttons.scss

Add Geo attachment replication QA spec

Closes gitlab-qa#128

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

Add `createNewItemFromValue` option and `clearDropdown` method to `create_item_dropdown` -- EE merge edition

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

CE upstream - 2018-01-30 11:56 UTC

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

doc: Correct example responses in repository_files.md

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

Update index.md

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

Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110

Fix grape-route-helper route shadowing

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

Resolve "Missing space between edit and delete buttons in tag list"

Closes #41802

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

[ci skip]

CE upstream - 2018-01-30 09:26 UTC

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

[ci skip]

[ci skip]

Add noData empty state to Prometheus graphs

Closes #42558

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

CE upstream - 2018-01-30 06:24 UTC

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

Allow project to be set up to push to and pull from same mirror

Closes #4670

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

Fix JIRA not working when a trailing slash is included

Closes #42494

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

Leaving a trailing slash in the context option causes the jira-ruby
gem to add an extra slash in HTTP requests to the URL, preventing
JIRA from working properly.

Closes #42494

CE upstream - 2018-01-29 21:25 UTC

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

Bringing in https://github.com/reprah/grape-route-helpers/pull/21 as a
monkey patch since the grape-route-helpers project seems to be abandoned

Fail static-analysis if there's output to stderr

Closes #41972

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

gitlab-ce!16708 port

Closes #4690

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

Return more consistent values for merge_status on MR API

Closes #20639

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

Preserve updated issue order to store when reorder is completed

Closes #4716

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

CE upstream - 2018-01-29 15:59 UTC

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

Replace $.post in edit blob with axios

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

Merge branch '2877-code-quality-requires-codequality-json-to-be-the-only-artifact-file-in-the-job' into 'master'

Resolve "Code quality requires `codequality.json` to be the only artifact file in the job"

Closes #2877

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

Fix cache clear windows

Closes #42487

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