# Conflicts:
#	app/services/boards/issues/list_service.rb
#	app/views/shared/boards/components/_board.html.haml
#	doc/administration/high_availability/nfs.md
#	lib/api/projects.rb

[ci skip]

Clean up AWS EFS documentation

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

Allow Pseudonymizer to write to a bucket without having permissions to see all buckets

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

CE upstream - 2018-07-27 22:47 UTC

Closes gitaly#1295 and #6252

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

Fix typos in CreateGpgSignatureWorker spec

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

Add /-/health basic health check endpoint

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

This is an EE-specific test that was broken by
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20871.

Fix /admin/jobs failing to load due to statement timeout

Closes #49767

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

Calling `Fog::Storage::AWS::Directories#get` requires the ListAllMyBuckets
permission, but we can avoid that extra query and permission by initializing
the directory with a specific bucket.

Resolve "Improve Error Message When Adding Invalid User to Project via API"

Closes #32821

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

Make rbtrace work under unicorn

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

The `ORDER BY created_at DESC` clause causes a sequential scan because
there is no index on the `created_at` column. We can sort by `id`
or by `updated_at` to make things fast.

Closes #49767

Create GPG commit signature in bulk

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

Fix link to Cycle Analytics in help

Closes #49729

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

Permit concurrent loads in gpg keychain mutex

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

Update GitLab Workhorse to v5.1.0

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

Bump prometheus-client-mmap to 0.9.4

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

The Unicorn master resets any signal handlers and prevents rbtrace
from working properly as a result. Move the `require 'rbtrace'` call
to the Unicorn `after_fork` block and keep the initializer only for Sidekiq.

Resolve "Mutual SSL Auth For Helm TIller"

Closes #48098

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

API endpoint for configuring repository pull mirroring via HTTP

Closes #1499

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

Removed beta designation from Group SSO

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

Resolve "Sorting by name on milestones page renders a 500 error"

Closes #49701

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

We should sort by title because name is only an alias for
the title attribute on the milestone model.

[Backport] View summed weights of issues in board column

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

View summed weights of issues in board column

Closes #3772

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

Wrap `[skip ci]` in quotes in Crowdin.yml

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

Resolve "Copy diff file path as GFM" is broken

Closes #48823

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

[EE port 20858] Rails5 update Gemfile.rails5.lock

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