# Conflicts:
#	app/assets/javascripts/main.js
#	app/assets/javascripts/monitoring/components/dashboard.vue
#	app/assets/javascripts/notes/components/note_header.vue
#	app/assets/javascripts/user_popovers.js
#	app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
#	app/controllers/projects/environments_controller.rb
#	locale/gitlab.pot
#	spec/javascripts/api_spec.js
#	spec/javascripts/user_popovers_spec.js

[ci skip]

CE upstream - 2018-12-07 20:59 UTC

Closes gitlab-ce#54862 and gitlab-runner#3807

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

Change link for upgrades and renewals questions

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

Fix failure in spec/services/groups/autocomplete_service_spec.rb

Closes #8777

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

Epic issue list and related issue list re-design

Closes #6086

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

CE Backport: Epic issue list and related issue list re-design

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

You can't add user to subgroup with lower access level than parent group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Resolve "Navigating unresolved discussions on Merge Request page"

Closes #51122

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

Port to EE: Resolve "Navigating unresolved discussions on Merge Request page"

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

EE Compat Version for Resolve "Extended User Centric Tooltips"

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

Resolve "Extended user centric tooltips"

Closes #50157

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

[CE] Backport SAML unlink changes: UrlBlocker#ascii_only

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

Group SAML SSO page warns when linking account

Closes #8260

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

Resolve "Utilize new charting library for metrics dashboard"

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

Port "Utilize new charting library for metrics dashboard" to EE

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

Integrate csslab (EE)

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

Integrate csslab

Closes csslab#1

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

Fix for incorrect Correlation-ID key being passed through GRPC metadata

Closes #55054

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

Add Kushal to frontend CODEOWNERS

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

This commit includes all the changes from the CE
branch: 51122-fix-navigating-discussions to port
the changes to EE.