# Conflicts:
#	app/assets/stylesheets/pages/settings.scss
#	app/controllers/projects/clusters_controller.rb
#	app/models/group.rb
#	app/workers/project_cache_worker.rb
#	spec/features/admin/admin_settings_spec.rb
#	spec/features/projects/members/share_with_group_and_members_spec.rb
#	spec/features/protected_branches_spec.rb
#	spec/workers/project_cache_worker_spec.rb

[ci skip]

Improves performance on MR refactor and adds specs

Closes #48825

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

File Icons in Merge Requests

Closes #48651

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

Merge branch '44697-when-editing-a-comment-in-an-issue-the-preview-mode-is-toggled-in-the-main-textarea' into 'master'

Resolve "When editing a comment in an issue, the preview mode is toggled in the main textarea"

Closes #44697

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

CE upstream - 2018-07-04 12:21 UTC

Closes gitaly#329, gitaly#320, gitaly#323 et gitaly#328

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

Fix discussion entity for legacy diff notes

Closes #48474

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

i18n: externalize strings from 'app/views/projects/snippets'

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Enable frozen string in apps/uploaders/*.rb

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

Refactor the review-docs workflow

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

Remove unneeded changelog

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

Remove unnecessary ignore for Gitaly N+1

Closes #47594

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

The changelog of
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18027
was in the wrong location.

[ci skip]

Resolve "QA: Merge request squash sometimes fail"

Closes #48779

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

[ci skip]

[ci skip]

[ci skip]

Close revoke deploy token modal on escape keypress

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

Add `environment` drop down to Metrics dashboard

Closes #45738

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

Port of EE refactoring to extract EE lines from boards

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

Extract EE specific files/lines for app/assets/javascripts/boards

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

Partially addresses #47424.

Update OmniAuth Shibboleth gem to latest

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

Minor layout width update in profile preferences docs

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

Resolve "Failing ESLint on master"

Closes #48853

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Enable Capybara/FeatureMethods cop

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

Enable Capybara/FeatureMethods cop (EE-port)

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

[QA] Ensure we wait for the squash checbox to be clickable before clicking it in the squash scenario
Signed-off-by: Rémy Coutable <remy@rymai.me>