[ci skip]

# Conflicts:
#	doc/api/README.md
#	spec/lib/gitlab/incoming_email_spec.rb

[ci skip]

Add support for variables expression regexp syntax

Closes #43601

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

Do not allow to trigger manual actions that were skipped

Closes #42589

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

EE ccr/regexp anchor

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

Add anchor for incoming email regex, closes 44989

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

Merge branch '5971-geo-verification-information-section-shows-incorrect-data-values-for-the-primary-node-in-geo-admin-screen' into 'master'

Resolve "Geo: Verification information section shows incorrect data values for the primary node in Geo admin screen"

Closes #5971

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

Add doc about backup-restore in docker and k8s

Closes gitlab-org/distribution/team-tasks#87

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

CE upstream - 2018-05-17 21:27 UTC

Closes gitlab-com/infrastructure#4228

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

Resolve "Expand API: Render an arbitrary Markdown document"

Closes #19861

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

Bring CE-EE parity to app/services/milestones/base_service.rb

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

Bring CE-EE parity to app/services/lfs/unlock_file_service.rb

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

Update EE > CE downgrade service removal steps

Closes #46441

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

Loosen the matcher in the MR creation test

Closes gitlab-qa#245

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

Fix dependency scanning report with vulnerability without CVE

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

Fix api_json.log not always reporting the right HTTP status code

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

As described in https://github.com/aserafin/grape_logging/issues/45, if
a Grape error is caught by the handlers and a different return code
is returned, then the api_json.log would have a 500 error code
instead of the right value. Inserting the GrapeLogging middleware
after the Grape middleware fixes this problem.

Seen in https://gitlab.com/gitlab-com/infrastructure/issues/4249

Revert "Use less aggressive sticking for DB load balancing"

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

Resolve "Web IDE: Previewing Markdown in Firefox doesn’t show a scroll bar"

Closes #45934

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

Add Keyboard shortcuts for "Kubernetes" and "Environments"

Closes #46427

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

Move API group deletion to Sidekiq

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

Move API group deletion to Sidekiq

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

This reverts merge request !5732

add specific details related to how the UX team uses labels to tackle issues

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

# Conflicts:
#	app/assets/stylesheets/pages/pipelines.scss

[ci skip]

CE upstream - 2018-05-17 18:26 UTC

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

Fixed illustration alignment for group milestones promotion

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