# Conflicts:
#	app/views/import/github/new.html.haml
#	locale/gitlab.pot

Create CI/CD-only projects from GitHub -- CE backport

See merge request gitlab-org/gitlab-ce!17432
# Conflicts:
#	locale/gitlab.pot

# Conflicts:
#	VERSION

Fix Error 500 when updating a project

Closes #44019

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

Create CI/CD-only projects from GitHub

Closes #3839

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

Prepare 10.6 RC1

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

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

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

CE to EE could already have run the CE migration,
making these migrations not useful anymore.

Make sure we override the method from CE, too

[EE] Speedup rake jobs

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

Security: fix documentation for Geo replication

See merge request gitlab/gitlab-ee!586

Fix LDAP group sync no longer configurable for regular users (10.5 port)

See merge request gitlab/gitlab-ee!594

[10.5] Prevent new push rules from using non-RE2 regexes

See merge request gitlab/gitlab-ee!598

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

[10.5] Project can no longer be shared between groups when both member and group lock are active.

See merge request gitlab/gitlab-ee!597

Ensure that OTP backup codes are always invalidated - 10.5 port

See merge request gitlab/gitlabhq!2324

Update gitlab-pages version (GitLab 10.5)

See merge request gitlab/gitlabhq!2330

This reverts commit 0b7d1085

Fixed confict in schema.rb

Unify deployment_platform interface with EE

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

Fix group boards migration name

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

CE upstream - 2018-03-06 15:24 UTC

Closes gitaly#1056, gitaly#1059, and gitlab-com/gitlab-docs#154

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

Fixes and enhancements for Geo admin dashboard

Closes #4658, #4864, and #4493

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

Merge branch 'move-pipeline_default-update_head_pipeline_for_merge_request-queue-to-pipeline_processing-namespace' into 'master'

Move update_head_pipeline_for_merge_request queue to `pipeline_processing` namespace

Closes #43919

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

Set sha256 checksum when archiving traces

Closes #43940

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

CE Port: Add `js-` classes in LabelsSelect component

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

Add labels support to Epics

Closes #3727 and #4032

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

Cluster monitoring changes CE backport

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

Resolve "Repository mirroring should notify when failed"

Closes #1123

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

Port to EE "Add archive feature to trace"

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

Bring one group board to CE

Closes #38337

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

EE PORT Bring one group issue board to CE

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