# Conflicts:
#	app/serializers/project_mirror_entity.rb
#	app/views/projects/settings/repository/show.html.haml
#	locale/gitlab.pot

[ci skip]

Add doc for epic state change notifications

Closes #8476

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

Make sidekiq-cluster play well with Sidekiq 5.2.2+

Closes gitlab-ce#54253

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

CE upstream - 2018-11-20 13:22 UTC

Closes gitlab-ce#54189, #8488, and gitlab-ce#54236

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

Allow path access during testing

Closes #8504

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

Docs: fix user metrics doc

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

Resolve "Docs feedback: Update gitaly docs"

Closes #54166

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

SSH public-key authentication for push mirroring

Closes #49565

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

Push mirroring SSH support

Closes gitlab-ce#49565

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

[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]

Sidekiq 5.2.2 introduced a change
(https://github.com/mperham/sidekiq/pull/3936/files) that prevents queue
names from being duplicated. This breaks our current GitLab.com
config because we have some sidekiq-cluster processes configured
as the following:

```ruby
sidekiq_cluster['queue_groups'] = ["process_commit,process_commit"]
```

To keep things backwards compatible, we now only pass unique queue names
but scale the weights accordingly by the number of queues mentioned.

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

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

Fixes: https://gitlab.com/gitlab-org/gitlab-ee/issues/8504

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