# Conflicts:
#	app/assets/javascripts/notes/components/note_form.vue
#	db/schema.rb
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-11-29 00:21 UTC

Closes gitlab-ce#38317, #8608, #2727, #2732, and #2742

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

Pass GITLAB_REF_SLUG to CNG triggered pipelines

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

Backport of draft-design-improvements changes

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

Improve draft note header design

Closes #7920 and #7905

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

Store hashed storage paths in the database

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

Store hashed storage paths in the database

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

Fix horizontal scrollbar overlapping content everywhere, #51296.

Closes #51296

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

Display commit ID for commit diff discussion on merge request

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

Moves the pending badge into the header.
Enables the toggle resolve button to toggle the resolve status
of a draft note.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/7905

Retry the review-qa-smoke job twice

Closes #54610

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

Fix Environment terminal specs for EE

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

Docs: add link to the docs site from /help landing page

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

Docs: add link to the docs site from /help landing page

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

Merge branch 'docs/8608-update-approval-guidelines-to-include-red-orange-data-reviews' into 'master'

Add RED data security requirement to code review

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

Remove link that is broken now

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

Commits API: Preserve file content in move operations if unspecified

Closes #52974 et #51083

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

Also, enable debug mode.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflicts for
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8634

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8634

Resolve conflict in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8634

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8634

And place #track_project_repository in Projects::CreateService
instead.

A shard is now the proper name for a repository storage, so Shardable
is an acceptable name for defining the repository shard.