# Conflicts:
#	app/assets/javascripts/notes/components/comment_form.vue
#	app/assets/javascripts/notes/components/noteable_discussion.vue
#	app/assets/javascripts/notes/components/noteable_note.vue
#	doc/user/admin_area/custom_project_templates.md
#	locale/gitlab.pot
#	spec/migrations/delete_inconsistent_internal_id_records_spec.rb

[ci skip]

CE upstream - 2018-11-30 05:21 UTC

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

Upgrade GitLab Workhorse to v7.3.0

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

Add additional scope check to Todo#for_target spec

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

Fix pod log dropdown not switching

Closes #7745

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

This works around a condition where the Issue and the MergeRequest
created by FactoryBoth both had the same ID, which caused `for_target`
to return two records when we only expected one.

Add documentation reference to gitaly-debug

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

Backport from gitlab-org/gitlab-ee!6878

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

Fix API::Namespaces routing to accept namepaces with dots

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

Fix API::Namespaces to accept namepaces with dots

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

Fix Red/Orange data link markdown

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

Resolve "Status Emoji currently replaces avatar on mobile"

Closes #51029

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

Remove broken link and fix markdown formatting

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

Improve wording on disabling impersonation in api/README

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

Externalize strings from `/app/views/invites`

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

Move drop_site_statistics to be a post deployment migration

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

Upgraded Codesandbox packages

Closes #51210

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

Make Project's only_mirror_protected_branches value false by default

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

ci/config: generalize Config validation into Gitlab::Config:: module

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

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51210

Fix typo in method name "silence_stderr"

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

Remove auto deactivation when failed to create a pipeline via pipeline schedules

Closes #41231

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

Resolve "mergeUrlParams wrong with fragment url"

Closes #54218

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

Extract shared timeline entry component (EE-port)

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

Extract shared timeline entry component

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

Resolve "Merge request refactor does not highlight selected line"

Closes #48496

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

It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to
API::NAMESPACE_OR_PROJECT_REQUIREMENTS

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

Currently a dependency for grape `~> 1.1` is defined but gitlab does not work…

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