# Conflicts:
#	spec/javascripts/vue_shared/components/markdown/toolbar_spec.js

[ci skip]

Resolve "Geo DR: planned failover (including of a multi-node secondary)"

Closes #3952

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

Add performance monitoring docs for the new FE guide

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

Update spec import path for vue mount component helper

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

CE upstream - 2018-03-20 18:26 UTC

Closes gitlab-qa#208

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

Update Epic documentation to include labels

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

Resolve "Loss of input text on comments after preview"

Closes #42880

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

Make `ci_cd_projects` globally available for .com

Closes #5283

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

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

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

Prevent auto-retry AccessDenied error from stopping transition to failed

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

Fix end-to-end specs for rebasing a merge request

Closes gitlab-qa#208

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

Update HA Consul troubleshooting doc-docs

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

The coming year `ci_cd_projects` should be available for _all_
projects on GitLab.com. So making them global features allows all
projects to use them.

For that to work, we also need to enable `repository_mirrors` and
`github_project_service_integration` so the projects can correctly be
mirrored to allow CI to run.

Update merge request maintainer access docs

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

Break security issues report component into smaller ones

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

Execute FDW SystemChecks only in Geo Secondary node

Closes #5266

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

Update cloud native Helm chart docs for alpha

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

* 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

Resolve "Add documentation for "Display IP Address Of Runner On Runner Page""

Closes #44232

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