The release-bot merged !7957 by accident, which broke master.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8024

2. enable jasmine/no-promise-without-done-fail

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

CE upstream - 2018-10-16 21:51 UTC

Closes gitlab-ce#50903

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

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

Closes gitlab-ce#52487

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

This is the EE-port of 5ea377a4

Fix "ready for review" link

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

Fix commit signature error when project is disabled

Closes #50903

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

Resolve "Webhook Image URLs Rewritten Incorrectly in Issues"

Closes #52650

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

Prettify all the things (part 6)

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

# Conflicts:
#	Gemfile.lock
#	Gemfile.rails5.lock
#	app/assets/javascripts/boards/components/issue_card_inner.vue
#	app/assets/javascripts/environments/components/environment_item.vue

[ci skip]

CE upstream - 2018-10-15 17:21 UTC

Closes gitlab-ce#39697

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

Fixes styling issues in test reports

Closes #51386 and #52147

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

Resolve "Project slug does not auto populate in IE11"

Closes #52686

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

Verify that usage ping works when all counts time out

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

Verify that usage ping works when all counts time out

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

[QA] Handle sign-up when terms must be accepted

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

Use grpc v1.15.x

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

Add IID headers to E-Mail notifications

Closes #52477

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

Merge branch 'ee-49417-improve-settings-pages-design-by-prioritizing-content-group-settings' into 'master'

EE port gitlab-ce!21115

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

Fixed file templates not clearing in Web IDE

Closes #52487

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

Document linguist overriding

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

Fixes diff stats not being visible with performance bar

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

Disable artifact validation for download action

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

Refactor test reports

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

Use grpc v1.15.x

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

These headers can be used to build URLs for API requests. Good examples
would be Issues and Merge Requests