# 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

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"

CE Merge conflicts for "Automatically navigate to last board visited"

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

# Conflicts:
#	db/schema.rb
#	lib/gitlab/patch/draw_route.rb

[ci skip]

CE: Put EE routes in EE files under EE directories

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

Put EE routes in EE files under EE directories

Closes #7864

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

Automatically navigate to last board visited

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

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

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

Improvement to ci/yaml documentation

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

# Conflicts:
#	app/views/shared/boards/components/_board.html.haml

[ci skip]

Port of 52545-guest-create-issue-in-group-board to EE

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

Resolve "Adding issues from group/project board is not allowed for project-level users"

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

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

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

Resolve "Filter by `None`/`Any` for assignee_id in issues/mrs API"

Closes #52384

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