# 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

Fix spec failure by creating a project that has a repository in ee/spec/services/merge_requests/build_service_spec.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>

Fix UX handbook link in contribution guide

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

ListCommitByOid isn't called with an empty batch

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

Use Gitaly 0.105.1

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

Resolve "Board list creation is broken"

Closes #47823

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

Document elasticsearch sizing requirements

Closes gitlab-elasticsearch-indexer#17

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

The `errors/access_denied` page should not fail to render when no
message is provided.

When accessing something as a sessionless user, we should also display
the terms message if possible.

Because otherwise capybara-screenshot/rspec can't
take the screenshots for us. If we got an error,
we don't want to continue anyway?

resolving MR 19611-fix/enhance start-using-git doc

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

Drop ignored Geo repository_storage_path columns

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

Boost Geo prune worker to run every 2 hours instead of 6

Closes gitlab-com/infrastructure#4231

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

Resolve "Scrolling tabs are broken on profile, activity, and projects"

Closes #47501

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

* master:
  Add documentation: Overview of Frontend Testing
  Resolve "Add `/confidential` quick action for issues"
  i18n: externalize strings from 'app/views/award_emoji'
  Fix broken tests due to bad conflict resolution
  Updates eslint rules
  Documentation does not need an exception to be picked
  Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue
  [Rails5] Fix `storage_counter` helper
  Adjust SQL and transaction Prometheus buckets
  Updates eslint vue plugin version

Batching commits for performance improvements, might lead to empty
batches being used. This isn't the case yet, but to guard against this
in future cases, a guard clause is added.

Add documentation: Overview of Frontend Testing

Closes #45732

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

Adjust SQL and transaction Prometheus buckets

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

Resolve "Add `/confidential` quick action for issues"

Closes #47145

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

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

Resolve "[Rails5] `StorageHelper#storage_counter uses commas as thousands separator` fails"

Closes #47375

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