# Conflicts:
#	app/helpers/services_helper.rb

[ci skip]

EE port of "Prometheus graphs have no empty state when no data is present"

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

Resolve "Prometheus graphs have no empty state when no data is present"

Closes #42558

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

Resolve "Search code blob sometimes shows filename and branch"

Closes #44280

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

Configurable timeout for external authorization

Closes #4832

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

Improve JIRA event descriptions

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

Improve JIRA event descriptions

Closes #25542

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

Remove `www.` from `twitter_url` helper

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

CE upstream - 2018-03-20 06:23 UTC

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

Ee move render gfm

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

Move render gfm to commons and update imports

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

CE upstream - 2018-03-19 21:23 UTC

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

Show Ajax requests in performance bar

Closes #43925

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

# 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

This commit allows a user to set a timeout for the external
authorization service.

When the external service does not reply in time, access will be denied.

This will allow us to configure the timeout when calling the external
authorization service.