# Conflicts:
#	Gemfile
#	Gemfile.lock
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	doc/user/project/integrations/prometheus.md
#	lib/api/search.rb

[ci skip]

[Rails5] Update active_record_locking initializer

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

Optional '/-/' delimiter for search API

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

Improvements for prometheus metrics documentation

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

Add documentation for custom metrics

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

Add Cluster Monitoring Documentation

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

[EE] Optional '/-/' delimiter for epics and search API

Closes #5245

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

Ignore unsubscribed toggle for @ mentions

Closes #43933

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

Clean up selectors in framework/header.scss

Closes #44383

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

'/-/' delimiter is used only in UI, in API we don't use it for
other endpoints. To align search endpoints with the rest of API
endpoints, this patch makes '/-/' optional for existing endpoints (to
keep backward compatibility).

Documentation is updated to prefer paths without '/-/'.

'/-/' delimiter is used only in UI, in API we don't use it for
other endpoints. To align epics and search endpoints with the rest of API
endpoints, this patch makes '/-/' optional for existing endpoints (to
keep backward compatibility), for new endpoints (epic notes, discussions)
'/-/' path is not included.

Documentation is updated to prefer paths without '/-/'.

Closes #5245

CE upstream - 2018-03-19 15:28 UTC

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

Resolve "Add documentation for "Display ingress IP address in the Kubernetes page""

Closes #44330, #42761, and #43526

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

Update google-api-client 0.13.6 -. 0.19.8

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

Unify format for nested non-task lists

Closes #44384

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

Fix Geo docs for 10.6

Closes #5259, #5264, and #5265

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

Issue Boards: Ensure that horizontal scroll bars are shown on overflow

Closes #2680

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

Remove N+1 queries in /admin/projects page

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

Move ShaMismatch vue component

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

Move ShaMismatch vue component

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

# Conflicts:
#	app/models/issue.rb
#	app/services/projects/destroy_service.rb
#	db/schema.rb

[ci skip]

Fix "Can't modify frozen hash" error when project is destroyed

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