* master: (81 commits)
  Fix undefined method `log_transfer_error'
  Resolve the conflict in services_helper.rb
  move render_gfm into behaviors directory
  move render_gfm into behaviors directory
  fix tests for dahboard.vue
  fix tests for dahboard.vue
  Resolve conflict in lib/api/search.rb
  Resolve conflict in vue_merge_request_widget/dependencies.js
  Resolve Gemfile conflicts
  Resolve conflict in prometheus.md
  add no_data illustration to monitoring empty state
  add no_data illustration to monitoring empty state
  Enable controls when overridden
  Add documentation for custom metrics
  Add Cluster Monitoring Documentation
  Add documentation for external authorization
  Improve JIRA event descriptions
  Improve JIRA event descriptions
  Specify timeout for external authorization
  Add external authorization timeout to settings
  ...

Tidy up IDE code

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

CE upstream - 2018-03-20 09:27 UTC

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

Merge branch '5335-undefined-method-log_transfer_error-for-gitlab-geo-jobartifacttransfer-0x00007fea0ac401e8' into 'master'

Resolve "undefined method `log_transfer_error' for #<Gitlab::Geo::JobArtifactTransfer:0x00007fea0ac401e8>"

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

Fix broken `use_file` method

Closes #4827

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

Fix LDAP group sync permission override UI

Closes #5301

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

# 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