# Conflicts:
#	app/models/group.rb
#	spec/models/project_spec.rb

[ci skip]

Delete remote uploads

Closes #45425

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

API support + Improved policies for group runners

Closes #45894 and #38979

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

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

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

Add jobs to verify that migrating from CE to EE works

Closes #5980

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

# Conflicts:
#	app/controllers/admin/dashboard_controller.rb
#	app/views/admin/dashboard/index.html.haml

[ci skip]

CE upstream - 2018-05-16 15:38 UTC

Closes gitlab-ce#46412

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

Fix contributors graph width

Closes #22647

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

Fix Error 500 viewing admin page due to statement timeouts

Closes #46255

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix Error 500 viewing admin page due to statement timeouts (EE port)

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

fixed copy to cliboard button in embedded snippets

Closes #46303

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

Adjust board lists header text color

Closes #36983

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

Migrates EE-only js components to single file components

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

# Conflicts:
#	LICENSE

[ci skip]

Uses PostgreSQL tuple estimates to provide a much faster yet approximate
count. See https://wiki.postgresql.org/wiki/Slow_Counting for more details.
We only use this fast method if the table has been analyzed or vacuumed
within the last hour.

Closes #46255

Uses PostgreSQL tuple estimates to provide a much faster yet approximate
count. See https://wiki.postgresql.org/wiki/Slow_Counting for more details.
We only use this fast method if the table has been analyzed or vacuumed
within the last hour.

Closes #46255

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

Never drop the database when granting privileges

We're not trying to reuse the commands here because:

* Avoid touching CE tasks
* Allow them to evolve independently if needed
* It's nice to have highlighted command lines history

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