This allows us to check specific abilities in views, while still
enabling/disabling them at once.

CE upstream - 2018-07-05 12:27 UTC

Closes charts/gitlab#565 and #4266

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

Make clear that DAST is passive scanning only

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

Unify app/views/shared/issuable/_search_bar.html.haml

Closes #6145

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

Verify version on container scanning note

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

Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"

Closes gitlab-qa#287

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

Update CE branch whenever EE is ahead of CE branch

Closes #5960

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

Updated Gitaly timeout values

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

Add documentation for new search filtering functionality for ES

Closes #6510

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

[Port] Add Web Terminal for CI builds

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

See:
https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/79125195

CE branch is up-to-date.

Resolve "Support GitLab subgroups in Jira development panel"

Closes #3561

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

# 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

This reverts merge request !20339