# 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]

[ci skip]

Resolve "Text from the diff is showing within a table header inside the discussion after the discussion is resolved"

Closes #45514

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

Resolve "Text from the diff is showing within a table header inside the discussion after the discussion is resolved"

[EE-PORT] Fix issues without links when added from boards new issue  modal

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

Fix issues without links when added from boards new issue  modal

Closes #45435

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

Fix `NULL` insert attempts for `missing_on_primary`

Closes #5727

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

…if not a 404, or if no body is present, because the result will be saved as `missing_on_primary`, which does not allow NULL.

Fix a documentation typo for GitLab pages

Closes #45568

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

Documentation: Frontend Building Checklist

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

Refactored activity calendar

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

Rename #qa slack channel to #quality in docs

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

Resolve "Broken master due to goldiloader"

Closes #5725

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

Signed-off-by: Rémy Coutable <remy@rymai.me>