# Conflicts:
#	app/views/layouts/nav/sidebar/_project.html.haml
#	locale/gitlab.pot

[ci skip]

Project Sidebar: Split CI/CD into CI/CD and Operations

Closes #43673

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

Move Gitlab::Git::Repository#add_branch to mandatory

Closes gitaly#540

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

CE upstream - 2018-05-16 09:25 UTC

Closes gitaly#884

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

Remove docker pull prefix from registry clipboard feature

Closes #46314 and #45968

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

Port of gitlab-ce!18941

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

Docs fe vuex updates

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

Add contact sales option for Epics

Closes #5710

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

CE upstream - 2018-05-16 03:24 UTC

Closes gitlab-com/infrastructure#3499

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

Document the 3h timeout for GitLab.com shared Runners

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

Add documentation for bulk editing of issues and merge requests

Closes #41873

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

Ref contains oid check done by Gitaly

Closes gitaly#884

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

5943 improve license management tests

Closes #5943

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

# Conflicts:
#	app/models/project.rb
#	db/schema.rb
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-05-15 09:46 UTC

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

Fix bug with long strings in issue boards

Closes #43367

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

Fix setting Gitlab metrics content types

Closes gitlab-com/infrastructure#3499

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

Does not rescue from GRPC::DataLoss errors

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

Geo: Fix repo, wiki, and upload replication when renaming a namespace that has subgroups, without hashed storage enabled

Closes #6012

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

Resolve "Add nip.io domain suggestion in the Kubernetes cluster details view"

Closes #45584

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

EE: Display help text below auto devops domain with nip.io domain name (#45561)

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

improve basic details on inspecting NFS mounts

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

This limit is (and already was) different in compare to CE
version, bumping this now to reflect recent change introduced by
gitlab-ce!18735.

add values to OpenID configuration test, not only checking for issuer key

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

Fix link for `query_recorder.rb`

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

fix runner requirements

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

The method "content_type" on a controller does not always return the
correct content type. On the other hand, the method "request_format"
does _and_ immediately returns a Symbol (e.g. :json) instead of a
mime-type name (e.g. application/json). With these changes metrics
should again report their action names correctly.

Fixes https://gitlab.com/gitlab-com/infrastructure/issues/3499