# Conflicts:
#   config/sidekiq_queues.yml

That way it will not create a CI/CD project when the FE pass a `false`
value with it.

Also fixed some broken specs

Resolve "Geo: Leftover temporary directories from failed clones"

Closes #4893 and #5036

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

Fix Epics not getting created in a Group with existing Epics

Closes #5143

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

Add CPU & Memory metrics to k8s cluster page

Closes #5029

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

Fix Geo Log Cursor not reconnecting after pgbouncer dies

Closes #5145

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

Store lfs on object storage by default

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

Add proxy_download to perform proxied sending of all files

Closes #4703

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

Fix uninitialized constant FdwSchemaUptoDateCheck

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

Geo: Ignore remote stored objects when calculating counts

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

GitHub Service sends status updates for pipelines

Closes #3836

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

Support for GitLab Chatops using Slash commands

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

[EE] Minor fixes in API doc

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

Use Project#full_name instead of name_with_namespace

Closes gitlab-ce#30786

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

CE upstream - 2018-03-06 20:12 UTC

Closes #4170

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

MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4688
Other MR for "Repo by URL",
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4642

# Conflicts:
#   ee/app/models/license.rb

Merge branch 'cherry-pick-b01d0422' into 'master'

See merge request gitlab/gitlab-ee!608

Security: fix documentation for Geo replication

See merge request gitlab/gitlab-ee!586

Merge branch 'jej/safe-regex-for-push-rules-10-5' into 'master'

See merge request gitlab/gitlab-ee!609

Merge branch '4471-member-and-group-lock-enabled-allows-project-to-be-shared-10-5' into 'master'

See merge request gitlab/gitlab-ee!607

If pgbouncer dies, then the connection may get stuck in `PQsocket() can't get
socket descriptor` state. Wrap the query in a transaction to allow the
connection to return to the pool and recover. This also potentially prevents
idle-in-transaction cancellations.

Closes #5145

Backport CE changes for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4701

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

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

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

# Conflicts:
#	spec/controllers/projects/prometheus/metrics_controller_spec.rb
#	spec/models/concerns/prometheus_adapter_spec.rb

Backport CE changes for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4701

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

[EE] Add discussion API

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