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

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

Add documentation for archive builds

Closes #53534

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

Show HTTP response code for Kubernetes errors

Closes #53628

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

The Gitlab::Geo::OauthSession has a lot of responsibilities,
this changes extracts each responsability into a proper class:

- GitLab::Geo::Oauth::Session
- GitLab::Geo::Oauth::LoginState
- GitLab::Geo::Oauth::LogoutState
- GitLab::Geo::Oauth::LogoutToken
- GitLab::ReturnToLocation

This updates the documentation for adding EE specific features to
clarify that `prepend` should be on the last line, and how to deal with
code that depends on class methods redefined in EE.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/53919

EE: Add documentation for archive builds

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

Adds a few UX tweaks after a call with @andyvolpe

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

Upgrade to node v10.x and yarn 1.12.x

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