This sets up GitLab CI to automatically push CE master changes into EE
master, or revert them if the changes cause merge conflicts. The CI
configuration contains a single job to do this: `merge:master`. This job
is executed for every push to master, and periodically using a CI
schedule.

The periodic job is necessary because incremental jobs may not be able
to revert commits if newly added commits depend on these commits. By
re-running the job periodically (including all changes since a large
enough time frame), we can ensure that such commits are also reverted
(if they still conflict at that time).

The job runs in its own "merge" stage, _after_ the build and prepare
stages, but _before_ running the tests. This ensures that randomly
failing tests won't prevent code from being merged into EE. Running the
stage after the "prepare" stage reduces the chances of the job reverting
CE changes just because it ran before a corresponding EE MR was merged
into EE master.

Updates linked pipelines to render inline

Closes #2122

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

Redesign of MR header sections

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

Parse and store dependency scanning results in database

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

Update maven_repository.md adding a / to the pom.xml repository before packages

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

Re-orders the Group Security Dashboard

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

Docs - Add more info about using NFS with a firewall

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

CE upstream - 2018-11-30 05:21 UTC

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

Fix pod log dropdown not switching

Closes #7745

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

Fix API::Namespaces to accept namepaces with dots

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

Make Project's only_mirror_protected_branches value false by default

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

Extract shared timeline entry component (EE-port)

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

It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to
API::NAMESPACE_OR_PROJECT_REQUIREMENTS

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8649

(cherry picked from commit e3bddb62)

Conflicts:
	app/assets/javascripts/notes/components/comment_form.vue
	app/assets/javascripts/notes/components/noteable_discussion.vue
	app/assets/javascripts/notes/components/noteable_note.vue

(cherry picked from commit 99862050)

# Conflicts:
#	app/views/projects/tree/_tree_content.html.haml
#	locale/gitlab.pot

[ci skip]

Resolve "Add packages_enabled attribute to Projects API"

Closes #8492

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

CE upstream - 2018-11-29 19:21 UTC

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

Resolve "Add border around the repository file tree"

Closes #50264

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

Resolve "Add border around the repository file tree" EE

Closes gitlab-ce#50264

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

This reverts commit 802fa98b.

Document how to create service account with admin

Closes #50005

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

Update robots.txt to exclude group_members and project_members, which can expose…

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

Update robots.txt to exclude group_members and project_members, which can expose sensitive user information to the web. Please see https://developers.google.com/search/reference/robots_txt for the correct wildcard format. 

Update Security developer workflow template

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

Resolve "Empty state for Packages screen"

Closes #7926

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