# Conflicts:
#	app/models/milestone.rb
#	db/schema.rb

[ci skip]

Warn admin access level may be removed from protected branch levels

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

Resolve "Document background verification"

Closes #5697

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

CE upstream - 2018-04-20 12:24 UTC

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

Dedupe yarn dependencies

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

EE port of "dedupe yarn dependencies"

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

Downgrade MySQL CI service from 8.0 to 5.7

Closes #45606

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

Downgrade MySQL CI service from 8.0 to 5.7

Closes #45606

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

add restart of gitlab-pages to apply gitlab pages settings

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

[ci skip]

MySQL 8.0 made the default authentication mode `caching_sha2_password`, and
this breaks our CI builds at the moment. Downgrade until we can figure
out how to support this.

Closes #45606

Resolve "Disaster Recovery doc: Promoted node -> Primary with Geo enabled is not clear"

Closes #5722

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

Atomic internal ids for all models

Closes #44259

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

EE-port for "Atomic internal ids for all models"

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

# Conflicts:
#	CHANGELOG.md
#	LICENSE
#	app/assets/javascripts/boards/models/list.js
#	app/models/issue.rb
#	db/schema.rb
#	doc/api/projects.md
#	lib/api/helpers/project_snapshots_helpers.rb
#	spec/lib/gitlab/import_export/safe_model_attributes.yml
#	spec/models/issue_spec.rb

[ci skip]

Add documentation on how to configure Redis Sentinel by persistent class

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

Resolve "Geo doesn't replicate `custom_hooks`"

Closes #5583

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

Don't include lfs_file_locks data in export bundle

Closes #45502

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

CE upstream - 2018-04-19 13:23 UTC

Closes #4541

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

Add an API endpoint to download git repository snapshots

Closes #39345

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

Add an API endpoint to download git repository snapshots (EE)

Closes #4767

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

Resolve "Show new branch/merge request button even if a branch / merge request already exists"

Closes #42803

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

Shows new branch/mr button even when branch exists

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

[ci skip]

[ci skip]