# Conflicts:
#	app/assets/javascripts/mr_notes/stores/index.js
#	app/assets/javascripts/notes/components/noteable_note.vue
#	app/services/merge_requests/refresh_service.rb
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-10-06 00:21 UTC

Closes #2708, #2706, and #7545

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

Check disabled_services when finding a service

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

This restores the changes in 1a90632c.

Fix invalid parent path on group settings page

Closes #52242

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

Backport CE changes for: [Frontend only] Batch comments on merge requests

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

[Frontend only] Batch comments on merge requests

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

Add button to insert table in markdown editor

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

Resolve "Refactor code quality similar to JUnit tests"

Closes #7125

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

Resolve conflicts in app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue

Bump Gitaly to v0.125.0

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

Backport of CE upstream - 2018-10-05 12:21 UTC

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

Geo: Add a Geo Status Widget to Admin > Projects

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