Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

# Conflicts:
#	app/assets/javascripts/diffs/store/actions.js
#	app/models/ci/pipeline.rb
#	app/serializers/issue_board_entity.rb
#	app/services/ci/create_pipeline_service.rb
#	app/views/admin/users/index.html.haml
#	doc/user/project/clusters/index.md
#	lib/gitlab/group_hierarchy.rb
#	lib/system_check/rake_task/app_task.rb
#	lib/system_check/rake_task/gitlab_task.rb
#	locale/gitlab.pot
#	spec/fixtures/api/schemas/entities/issue_boards.json
#	spec/models/project_spec.rb

[ci skip]

Add support for Group-level project templates

Closes #6861

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

Add API endpoint for vulnerability history at group level

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

CE upstream - 2018-12-04 18:45 UTC

Closes gitlab-ce#53600

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

Fix gitlab:geo:check rake task

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

Merge branch '8444-update-error-message-displayed-when-adding-an-unsupported-project-to-ops-dashboard' into 'master'

Resolve "Update error message displayed when adding an unsupported project to Ops Dashboard"

Closes #8444

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

Fixed expanding diff commit files

Closes #50662

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

Add new Korean and Polish proofreaders

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

Change container width for project import

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

Replace admin sidebar feature spec with view spec

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

Group SAML metadata endpoint

Closes #6090

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

Add UsageData for group/project clusters

Closes #54886

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

Use group clusters when deploying (DeploymentPlatform)

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

EE: Use group clusters when deploying (DeploymentPlatform)

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

Provide vulnerability counts per day per severity for the last 90 days.

Merge branch 'ee-50626-searching-users-by-the-admin-panel-wipes-query-when-using-sort' into 'master'

Fix losing search query when sort users on admin users page

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

Resolve "Searching users by the admin panel wipes query when using sort"

Closes #50626

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

Removed the merge-train script

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

Remove code related to automatic merging

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

Rename project's pipelines relation

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

Port of Rename project's pipelines relation

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

Fixed multiple discussions getting added to diff lines

Closes gitlab-ee#8195

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

Improve help and validation sections of maximum build timeout inputs

Closes #49434

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

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

Avoid 500's when serializing legacy diff notes

Closes #54793

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

Also adds tests for that feature flag, pushing it over
the danger-review limit requiring longer commit message.

Merge branch '8591-geo-http-403-when-dismissing-free-trial-of-gitlab-com-gold-message' into 'master'

Don't show 'Free Trial of GitLab.com Gold' message for secondary nodes

Closes #8591

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

We're moving the automatic merging logic to a separate repository, so
there's no need in keeping this file around.

[ci skip]