# Conflicts:
#   app/models/application_setting.rb
#   lib/api/settings.rb

Revert "Merge branch '48098-mutual-auth-cluster-applications' into 'master'"

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

Code cleaning in PostReceive services

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

Remove git rake tasks

Closes #41699 and gitaly#768

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

This reverts merge request !20801

Delete todos when users loses target read permissions

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

While reviewing this branch it was noted that this task was broken.
Given the limited value this task brings, and given the fact that much
of the old behaviour has been moved to be automatically fixed, removing
was a good option.

Suggestion in:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20806#note_91261001

This branch includes changes that removes a rake taks that cleans up
config.lock files.

This change bumps Gitaly so it happens automatically so users don't have
to bother.

These tasks are happening through housekeeping right now, by default
ever 10th push. This removes the need for these tasks.

Side note, this removes one of my first contributions to GitLab, as back
than I introduced these tasks through: 54e6c004

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

Update total storage size when changing size of artifacts

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

CE application settings (not Docs) Cleanup

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

Add user authentication activity metrics

Closes #47789

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

Fix authorization for interactive web terminals

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

Resolve "MR refactor: Disable toggle comments button when diff has no discussions"

Closes #49161

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

CE-Port of gitlab-ee!6708

Closes gitlab-ee#7038

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

Warn in IDE when user navigates away with staged changes

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

Resolve "Update poll.js to keep polling if the status code is 2xx"

Closes #49747

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

Fix bug with Wiki pages encoding

Closes #49512

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

[ci skip]

Fix typo in health check documentation

[ci skip]

Closes #49733

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

Extract EE-specific lines from issuable finders

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

Closes #49733

Clean up AWS EFS documentation

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

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

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

Closes #49767

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

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