# Conflicts:
#	LICENSE

[ci skip]

Add specs for geo with terms enforced

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

Add Group's GL.com plan name to payload of system hook

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

Remove table-section from div holding cluster error messages

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

edit GitLab license info in regards to CC licensing

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

CE upstream - 2018-05-16 12:32 UTC

Closes gitaly#540

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

Move discussion and notes actions to the right

Closes #33645

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

Fix GitLab Performance Monitoring content types for Doorkeeper

Closes #46412

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

# 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

Certain controllers (e.g. Doorkeeper::TokensController) don't expose the
method "request_format". This commit changes
Gitlab::Metrics::WebTransaction so we don't rely on this method, instead
using the underlying code this method uses.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/46412

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

In order to apply some validations when we process the hook on the
subscription portal we need to know what's the current plan of Group
that has generated the event.

GitHub uses a library called Licensee to identify a project's license
type. It shows this information in the status bar and via the API if it
can unambiguously identify the license.

This commit moves the reference to Creative Commons licensing from
the LICENSE file to the README, which allows Licensee to successfully
identify the license type of GitLab CE as MIT.
Signed-off-by: Andrea Kao <eirinikos@gmail.com>