For CE, #lfs_http_url_to_repo calls #http_url_to_repo where as for EE we
examine for a Geo setup so we can support push to secondary for LFS.

Added specs for #deploy_key_pushable?() and #type()

LfsToken::HMACToken#token_valid?() will be examined and if false, look
in redis via LfsToken::LegacyRedisDeviseToken#token_valid?().

Upgrade GitLab Workhorse to v7.4.0

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

Forward gitlab-svg

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

[QA] Add a log-out step and expectation to `qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb`

Closes #52700

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

Fixed typo in bitbucket import

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

[CE] Backport GroupSAML unlink changes

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

Remove pronunciation tip for knative

Closes #54724

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

Define the default value for only/except policies

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

Temporarily disable automatic merging

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

This reverts commit d7291c64

It appears that for some jobs
(https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/129705025 for example)
we process a range of commits far greater than necessary, which can lead
to commits getting reverted that were merged a long time ago.

[ci skip]

This reverts commit c3d0f129

Encrypt runners tokens

Closes #51232 and #52931

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

Update batch-loader dependency

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

Fixed multiple diff line discussions not expanding

Closes #53600

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

Automatically merge CE master into EE master

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

update installation from source guide

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

Previously we used @user, but this changed to local_assigns[:user]
so we could pass a second variable to the view from an EE module

Since we were already using current_user librally there it makes sense
to replace the remaining usages.

See: https://docs.gitlab.com/ee/development/module_with_instance_variables.html

- Improves spacing between account buttons on Profile
- AccountsController#show uses locals instead of instance variables
- New `display_providers_on_profile?` helper method
- Adds `render_if_exists` for GroupSAMl unlink buttons

See: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8682

CE port of Add new service to create the web ide terminal

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

Currently, if a job does not have only/except policies, the policy is considered as an unspecified state, and therefore the job is executed regardless of how it's executed and which branch/tags are targetted.
Ideally, this should be specified as only: ['branches', 'tags'], as it indicates that unspecified policy jobs are meant to run on any git references.

[CE backport]Add sort direction button with sort dropdown for epics

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

Added a Hebrew proofreader

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

Fix multiple commits shade overlapping vertical discussion line

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

Fixes a typo that prevented assets from being properly compiled

Closes #54825

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

This updates the documentation of automatic CE to EE merges to cover the
new automatic merging setup.

This sets up GitLab CI to automatically push CE master changes into EE
master, or revert them if the changes cause merge conflicts. The CI
configuration contains a single job to do this: `merge:master`. This job
is executed for every push to master, and periodically using a CI
schedule.

The periodic job is necessary because incremental jobs may not be able
to revert commits if newly added commits depend on these commits. By
re-running the job periodically (including all changes since a large
enough time frame), we can ensure that such commits are also reverted
(if they still conflict at that time).

The job runs in its own "merge" stage, _after_ the build and prepare
stages, but _before_ running the tests. This ensures that randomly
failing tests won't prevent code from being merged into EE. Running the
stage after the "prepare" stage reduces the chances of the job reverting
CE changes just because it ran before a corresponding EE MR was merged
into EE master.

# Conflicts:
#   doc/development/i18n/proofreader.md