CE upstream - 2018-11-13 17:21 UTC

Closes gitlab-ce#53919

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

Update draft comments design to match new design

Closes #8345

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

Upgrade to Ruby 2.5.3 (EE port)

Closes gitlab-ce#41825

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

Fix transient failure of group_member_contributions/components/app_spec.js

Closes #7728

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

Resolve "Tracing empty empty state image fails to load"

Closes #8378

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

# Conflicts:
#	app/models/identity/uniqueness_scopes.rb
#	doc/ci/examples/browser_performance.md
#	doc/ci/examples/code_quality.md
#	doc/ci/examples/container_scanning.md
#	doc/ci/examples/dast.md
#	doc/ci/yaml/README.md

[ci skip]

Attempt to update google-protobuf for migration-paths

Because the one we were using aren't compatible with
Ruby 2.5.3, and it'll be troublesome to switch Ruby.
Upgrading google-protobuf will be much easier.

All of them will need to be updated for Ruby 2.5.3

We remove oj because we don't really need it and it
doesn't compile on 2.5.3 with that version.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/41825

Updates ci header component with gitlab-ui

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

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

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

Update URL for the grafana instance of sitespeed

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

Fix license_management example

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

Add note on GitLab version requirement

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

Provide EE license to review apps

Closes #8410

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

Update docs to put prepend as the last line

Closes #53919

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

Add documentation about frontend test categories to frontend guide

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

Document new report types

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

Document new report types

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

Update keyboard shortcuts docs - Epics

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

Promote the GitLab.com Gold trial on a users default dashboard

Closes #6983

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

Update merge request page object and selectors

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

Update eks guide to include admin token creation.

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

Refactor reference regexes and identity scopes

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

Move EE prepend and include calls to the end of models

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

It reuses loading button instead of creating a new loading button
It uses the new gitlab-ui components

Refactoring Gitlab::Geo::OauthSession

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

# Conflicts:
#	doc/user/admin_area/settings/continuous_integration.md

[ci skip]

CE upstream - 2018-11-13 12:21 UTC

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

Resolve Markdown ordered lists not conforming to styleguide

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