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

Closes gitlab-qa#197

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

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>

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>

Add assignee lists to tiers table in docs

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

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]

Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue [ci skip]

Remove Group SAML beta cookie restriction

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

EE: Remove the btn-xs class from the stylesheets

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

Resolve "Dismissed issues fix got overridden by bs4"

Closes #6416

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

# Conflicts:
#	app/assets/javascripts/boards/components/board_sidebar.js
#	app/assets/javascripts/boards/components/issue_card_inner.js
#	app/assets/javascripts/ide/components/repo_commit_section.vue
#	app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js
#	app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue
#	app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue
#	app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
#	doc/user/project/issue_board.md
#	doc/user/project/quick_actions.md
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]

Render access denied without message

Closes #47844

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

Add support for verifying remote uploads, artifacts, and LFS objects in check rake tasks

Closes #47139

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

CE upstream - 2018-06-13 09:24 UTC

Closes gitlab-qa#271 et gitaly#771

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

QA: Only clear the sessions if there's no error with a block

Closes gitlab-qa#197

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

Database migrations should have a changelog entry.

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

Removes merge conflicts vue code from globalnamespace

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