# Conflicts:
#	Gemfile.lock
#	app/models/members/project_member.rb
#	app/views/import/github/new.html.haml
#	db/schema.rb
#	doc/api/merge_requests.md
#	locale/gitlab.pot
#	spec/policies/project_policy_spec.rb

[ci skip]

Don't delete todos or unassign issues and MRs when a user leaves a project

Closes #43899

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

[EE] Don't delete todos or unassign issues and MRs when a user leaves a project

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

Port changes from EE: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4885 (Maintainer push to fork)

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

Geo - Calculate repositories checksum on primary node

Closes #4756

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

CI/CD only GitHub import sets up service integrations

Closes #4721

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

backport of custom metrics for the common metrics section of CE

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

Merge branch '5174-spec-failure-ee-spec-finders-geo-lfs_object_registry_finder_spec-rb' into 'master'

Resolve "Spec failure: ee/spec/finders/geo/lfs_object_registry_finder_spec.rb"

Closes #5174

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

Update project activity when pushing to a wiki repository

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

Sets up service to notify GitHub of pipeline status

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

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

Create CI/CD-only projects from GitHub

Closes #3839

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

CE upstream - 2018-03-07 17:11 UTC

Closes #5171

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

Fix accessibility typo

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

Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4827 to CE

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

Resolve "User::DestroyService should cleanup projects where user is mirror_user"

Closes #3892

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

Move SidebarAssignees vue component

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

Move SidebarAssignees vue component

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

Resolve "Job Failed #56264107 and #56261601"

Closes #5171

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

- Remove unwanted chat was failing as a consequence of moving external support from Premium to starter. We have a dependency on config_processor a project with a repository must be used

Closes #5171

- Remove unwanted chat was failing as a consequence of moving external support from Premium to starter. We have a dependency on config_processor a project with a repository must be used

Closes #5171

Resolve "Add a mention and link to doc for security implications in the Kubernetes cluster page"

Closes #43780 and #43781

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