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

Also adds url_helper for use with paths from Rack middleware

Re-enables SAML metadata while ensuring that we don't
reveal private group existance to anonymous users

CE upstream - 2018-12-04 15:22 UTC

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

Update elasticsearch system check to check for new supported versions

Closes #8652

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

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

Encrypt runners tokens / EE

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

Add file and line numbers to vulnerabilities issues

Closes #8157

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

Users can unlink Group SAML from accounts page

Closes #5016

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

EE: Automatically merge CE master into EE master

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

# 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

This updates the documentation of automatic CE to EE merges to cover the
new automatic merging setup.

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.

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

Fix EE load balancing crashing on Rails 5

Closes #8692

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

Changes to the :group_saml trait were previously breaking
the ee-specific-lines check.

Previously we used @user, but this changed to local_assigns[:user]
so we could pass a second variable to the view from an EE module

Since we were already using current_user librally there it makes sense
to replace the remaining usages.

See: https://docs.gitlab.com/ee/development/module_with_instance_variables.html

Allows users to unlink their Group SAML accounts.
Needed so that users can decide when they no longer want to
allow an organization to log them into GitLab.com

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/5016

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