[ci skip]

# Conflicts:
#	CHANGELOG.md
#	locale/gitlab.pot
#	spec/models/merge_request_spec.rb
#	spec/models/project_wiki_spec.rb
#	spec/models/repository_spec.rb
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]

Fix typos in specs and js

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

Enable even more frozen string for lib/gitlab

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

CE upstream - 2018-11-20 08:21 UTC

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

Exclude code owner from merge request participants to avoid spam

Closes #8396

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

Update 11.3-to-11.4.md

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

Update 11.2-to-11.3.md

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

Fix PostReceive failing for project mirrors missing local branch

Closes gitlab-ce#50843

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

Externalize strings from `/app/views/projects/diffs`

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

Documentation: Correct inaccurate phrase related to disable_ddl_transaction mode

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

Add docs on post-merge pipelines

Closes #53527

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

Add docs on post-merge pipelines

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

Add docs for linking in changed pages from MR widget

Closes #53420

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

Add docs for linking in changed pages from MR widget

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

[ci skip]

[ci skip]

Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"

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

Fix a project icon in home panel view, #51157.

Closes #51157

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

This reverts merge request !23140

Change breadcrumb title for contribution charts

Closes #44567

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

Fixed the dimensions of image diffs

Closes #54236

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

Fixes to AWS documentation

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

New Crowdin translations

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

saml/auth_hash: Allow 2FA bypass for SAML 2.0 responses

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

Resolve "Add a `/create_merge_request` quick action"

Closes #40085

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

CE Port 22485 Creates /create_merge_request quickaction

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

Change project cache key to depend on ID instead of full path

Closes #42191

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

Improve FF "pick after the 7th" docs

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

This reverts merge request !23140

Code owner was included as part of approvers.
However this would cause notifications and todos,
which can spam code owners.
Remove notifications/todo for new code owners as approvers.

Remove duplicate yarn.lock entry

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