# Conflicts:
#	spec/models/ci/pipeline_spec.rb

[ci skip]

CE upstream - 2018-12-04 12:21 UTC

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

CE port of Add new service to create the web ide terminal

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

Add new service to create the web ide terminal

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

[CE backport]Add sort direction button with sort dropdown for epics

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

Added a Hebrew proofreader

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

Fix multiple commits shade overlapping vertical discussion line

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

Fixes a typo that prevented assets from being properly compiled

Closes #54825

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

# Conflicts:
#   doc/development/i18n/proofreader.md

Fix EE load balancing crashing on Rails 5

Closes #8692

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

Handle null start or due dates for dates sourcing milestone in Epics

Closes #8700

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

[CE] Backport TokenAuthenticatable comparison method and stub_default_url_options

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

Check the uniqueness of the values of pipeline enum

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

# Conflicts:
#	lib/gitlab/checks/base_checker.rb
#	lib/gitlab/checks/change_access.rb
#	lib/gitlab/checks/diff_check.rb

[ci skip]

Resolve "Add usage ping for Package Management"

Closes #8320

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

CE port Refactor Gitlab::Checks::ChangeAccess class

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

Refactor Gitlab::Checks::ChangeAccess class

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

CE upstream - 2018-12-04 10:23 UTC

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

Fallback to admin KUBE_TOKEN for project clusters only

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

Resolve "Group-level project templates: Mini renaming"

Closes #8637

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

Fix collapsing discussion replies

Closes #54646

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

CE upstream - 2018-12-04 00:21 UTC

Closes gitlab-ce#45992

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

This class handles the validations of git pushes. It is
quite big and all the logic is inside one file. This commit
refactors the code and split it into different files.

Revert "Merge branch 'auto-devops-support-for-group-security-dashboard' into 'master'"

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

CE Port2 of "Add empty and disabled web terminal tab"

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

Add empty and disabled web terminal tab

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