# Conflicts:
#	app/assets/javascripts/diffs/components/inline_diff_comment_row.vue
#	spec/javascripts/diffs/store/getters_spec.js

Ee 48804 redesign gcp banner

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

Extract EE-specific lines from Banzai pipelines

Closes #6065

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

Add burndown chart on group milestone page in Starter

Closes #6251

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

CE upstream - 2018-07-17 12:23 UTC

Closes gitaly#748, gitaly#695 et gitaly#799

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

Remove sanitize_repo_path for EE

Closes gitaly#1235

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

This method is unneeded given its been pushed to Gitaly, through
https://gitlab.com/gitlab-org/gitaly/merge_requests/780

Closes https://gitlab.com/gitlab-org/gitaly/issues/1235

EE counterpart of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20666

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

# Conflicts:
#	.gitlab-ci.yml

[ci skip]

Merge Templates updates

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

Close revert and cherry pick modal on escape keypress

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

CE upstream - 2018-07-17 08:47 UTC

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

Add Premium license checks for system messages

Closes #6160

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

Rails5 fix NoMethodError: undefined method 'message' for nil:NilClass

Closes #6605

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

Document pattern for .find_or_create and siblings

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

Add small improvement to Manifest import feature docs

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

Move Danger to test stage

Closes #49185

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

[EE] Move Danger to test stage

Closes gitlab-ce#49185

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

Add cross-link to N+1 issue

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

Implement customized sidebar

Closes #14995

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

[ci-skip]

Migrate merge base, merged branches, write ref

Closes gitaly#748, gitaly#695, and gitaly#799

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

Add emails delivery metrics

Closes #49214

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

Resolve "Change API docs to reflect that lookup by username does not require admin access"

Closes #38095

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

Update pipelines.md to have correct curl commands

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

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

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

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

CE upstream - 2018-07-16 15:23 UTC

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