# Conflicts:
#	app/assets/javascripts/environments/components/environment_item.vue
#	app/assets/javascripts/environments/components/environments_table.vue
#	app/assets/javascripts/monitoring/components/dashboard.vue
#	app/assets/javascripts/monitoring/components/graph/flag.vue
#	app/assets/javascripts/notes/components/note_form.vue
#	app/assets/javascripts/pipelines/components/graph/graph_component.vue
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
#	app/views/repository_check_mailer/notify.html.haml
#	app/views/repository_check_mailer/notify.text.haml

[ci skip]

Upgrade prettier to v1.15.2

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

EE port of "Upgrade prettier to v1.15.2"

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

Add user docs for Pages access control

Closes #54143

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

Merge branch '53571-Add-the-fact-that-Web-IDE-does-syntax-highlighting-for-all-languages-supported-by-Monaco' into 'master'

Added information about syntax highlighting in Web IDE. Fixes gitlab-org/gitlab-ce#53571

Closes #53571

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

Align issue status label and confidential icon

Closes #53943

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

Externalize strings from `/app/views/repository_check_mailer`

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

Externalize strings from `/app/views/repository_check_mailer`

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

CE upstream - 2018-11-20 19:00 UTC

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

Upgrade escape_utils to 1.2.1

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

CE upstream - 2018-11-20 18:49 UTC

Closes gitlab-ce#51635

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

Remove instances of `@extend .monospace`

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

CE upstream - 2018-11-20 15:23 UTC

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

Externalize strings from `/app/views/peek`

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

Resolve "The reply shortcut can add any text of the page to the "comment" text area"

Closes #54032

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

This matches the version shipped in gitaly-ruby.

The main changes between 1.1.1 and 1.2.1 are CI-related
improvements:
https://github.com/brianmario/escape_utils/compare/1.1.1...1.2.1

Open first 10 merge request files in IDE

Closes #51635

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