# Conflicts:
#	app/assets/stylesheets/framework/markdown_area.scss
#	app/assets/stylesheets/pages/merge_requests.scss
#	doc/user/markdown.md

[ci skip]

CE upstream - 2018-06-13 18:22 UTC

Closes gitlab-qa#197

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

Unify spec/lib/banzai/filter/image_lazy_load_filter_spec.rb

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

Move Gitaly RPCs to mandatory

Closes gitaly#217, gitaly#389, gitaly#390, gitaly#220, gitaly#376, and gitaly#354

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

Resolve "Reference to master still cached"

Closes #47851

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

Bring `rake postgresql_md5_hash` to CE

Closes gitlab-ee#6419

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

[Rails5] Fix snippets_finder arel queries

Closes #47832

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

Backport EE .flayignore lines to CE

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

Resolve "Geo: Use a separate column to rate limit verification checksum workers"

Closes #5172

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

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

Deny repository disk access in development and test

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

Override Gitlab::GitalyClient.explicit_opt_in_required

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

The method name was changed in gitlab-org/gitlab-ce!19501.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Following gitlab-org/gitlab-ce!19501, we now check remote objects too.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Fix flakey time-sensitive user comment on issue test

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

Fix fields for author & assignee in MR API docs

Closes #42445

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

Remove incorrect CI doc re: PowerShell

Closes #40164

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

Bring changes from EE for lib/system_check/simple_executor.rb

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

Invalidate cache with project details when repository is updated

Closes #33733

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

Add assignee lists to tiers table in docs

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

Add assignee lists to tiers table in docs

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

Fix shoulda-matchers in Rails 5

Closes #47639

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

Wrap YAML error in Web IDE pipelines panel

Closes #47755

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

For master->maintainer permission rename

Closes https://gitlab.com/gitlab-org/gitaly/issues/217

enable CommonMark as the default (EE version)

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

[ci skip] Fix conflicts for app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue

Fix conflicts for app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue [ci skip]