# Conflicts:
#	app/views/projects/tree/_tree_content.html.haml
#	locale/gitlab.pot

[ci skip]

Resolve "Add packages_enabled attribute to Projects API"

Closes #8492

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

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

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

Resolve "Add border around the repository file tree"

Closes #50264

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

Resolve "Add border around the repository file tree" EE

Closes gitlab-ce#50264

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

This reverts commit 802fa98b.

Document how to create service account with admin

Closes #50005

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

Update robots.txt to exclude group_members and project_members, which can expose…

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

Update robots.txt to exclude group_members and project_members, which can expose sensitive user information to the web. Please see https://developers.google.com/search/reference/robots_txt for the correct wildcard format. 

Update Security developer workflow template

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

Resolve "Empty state for Packages screen"

Closes #7926

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

Add empty state for graphs with no values

Closes #53018

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

# 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