# Conflicts:
#	GITALY_SERVER_VERSION
#	app/assets/javascripts/boards/components/issue_card_inner.vue
#	spec/features/protected_branches_spec.rb

[ci skip]

CE upstream - 2018-06-27 09:22 UTC

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

Migrate storage nesting check to Gitaly

Closes gitaly#1237

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

Fixes ESLint failure on master

Closes #6715

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

Remove default value for `remote_directory` in pseudonymizer config

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

Improve Hashed Storage documentation for rollback

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

Moves boards components into a .vue file

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

EE port Moves boards components into a .vue file

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

Resolve "Hide or disable security reports feedback actions when not authorized"

Closes #6078

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

Updates exception request documentation to link to the new location

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

Gitaly metrics check for read/writeability

Closes gitaly#1218

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

Gitaly metrics check for read/writeability

Closes gitaly#1218

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

Resolve "`!` autocomplete does not work anymore"

Closes #48528

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

Enable frozen string for app/workers/**/*.rb

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

Merge branch '46546-do-not-pre-select-previous-user-s-when-creating-protected-branches' into 'master'

CE port gitlab-ee!6112

Closes #46546

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

Resolve "Do not pre-select previous user(s) when creating protected branches"

Closes #6407

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

Add note to README about using $CI_COMMIT_REF_SLUG when using forward-slashes

Closes gitlab-ce#48275

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

Fixed storage coverage table with additional information
and wrote down implementationd details from few entities.

CE-EE parity for spec/models

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

CE-EE parity for spec/models

Closes #6665

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

Add Node.js to the languages supported by SAST

Closes #5652

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

Client-side fix for Gitaly TreeEntry bug

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

Closes #5652

Resolve "Copying ordered list to new comment becomes unordered"

Closes #40484

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