# Conflicts:
#	doc/README.md
#	lib/gitlab/checks/change_access.rb

[ci skip]

CE upstream - 2018-10-26 16:28 UTC

Closes gitlab-qa#59

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

User not defined in PostReceive#process_project_changes

Closes #51335

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

Adds tracing messages for slow git pushes

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

Adds trace of each access check when git push times out

Closes #42790

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

Upgrade Prometheus to 2.4.3 and Alertmanager to 0.15.2

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

Fix button rendering in license management in FF

Closes #7872

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

docs add first draft for runbook topic

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

docs add runbooks topic ee

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

# Conflicts:
#	app/assets/javascripts/monitoring/components/dashboard.vue
#	app/assets/javascripts/vue_merge_request_widget/ee_switch_mr_widget_options.js
#	app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js
#	app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_get_state_key.js
#	app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_mr_widget_store.js
#	app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_state_maps.js

[ci skip]

CE upstream - 2018-10-26 15:21 UTC

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

# Conflicts:
#	doc/topics/runbooks/index.md

Update review apps testing guide

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

E2E Test - LDAP login with SSL

Closes gitlab-qa#59

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

Prettify all the things (part 4)

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

Resolve circular dependencies in merge request widget

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

Resolve circular dependencies in merge request widget (EE-port)

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

Resolve "No longer require a deploy to start Prometheus monitoring"

Closes #45068

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

Resolve "No longer require a deploy to start Prometheus monitoring" - EE

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

Review Apps are now deployed automatically.
Note that if auth fails you might need to stop and redeploy the app.

Feature/add license to project API

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

Update content of visible tooltips

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

CE upstream - 2018-10-26 13:21 UTC

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

* ee/master:
  CE Merge conflicts for "Automatically navigate to last board visited"