Merge branch '45592-nomethoderror-undefined-method-commit-for-nil-nilclass-in-sidekiq-caused-by-a-merge-commit-in-a-forked-project-with-upstream-project-deleted' into 'master'

Resolve "NoMethodError: undefined method `commit' for nil:NilClass in sidekiq caused by a merge commit in a forked project with upstream project deleted."

Closes #45592

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

Bump gitlab-shell to 7.1.5

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

Avoid building potential invalid environment name while seeding

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

Use gitaly 0.112.0

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

Add back MR diff deletion migration

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

Remove last Gitaly flags from Blob and Workhorse

Closes gitaly#798, gitaly#529, and gitaly#875

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

Mention admin privileges for k8s token creation

Closes #44457

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

Fix object storage support notes

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

Add documenation about how to active debug logging for gitlab-pages

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

Resolve "ee_compat_check should remove `ce-` prefix or `-ce` suffix as ee-specific check"

Closes #46519

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

Add missing maximum_timeout parameter

Closes #48625

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

[Rails5] Permit concurrent loads

Closes #48263

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

Fix doc for large table column rename

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

Properly handle colons in URL passwords

Closes #49080

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

Fixes a NoMethodError in the pre-receive hook: https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/206

Fix ArgumentError in GitGarbageCollectWorker Sidekiq job

Closes #49096

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

When the Gitaly call failed, the exception handling failed
because `method` is expected to have a parameter.

Closes #49096

Before b46d5b13, we relied on
`Addressable::URI` to parse the username/password in a URL, but this failed
when credentials contained special characters. However, this introduced a regression
where the parsing would incorrectly truncate the password if the password had a colon.

Closes #49080

Mock timeouts and Promise in SmartInterval tests

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

This uses a similar approach in ee_specific_check.rb

Remove timestamps from `locale/gitlab.pot`

Closes #49077

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

This will help us avoid conflicts when regenerating the pot file, the
timestamps aren't used by Crowdin.

Add daylight saving time support for pipeline schedules

Closes #37165

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

Make sure ConflictsService does not raise for conflicting submodules

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

Fix a typo on CI Runner page on Projects

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

Merge branch 'rd-6804-bug-unable-to-delete-branches-when-repo-reaches-the-size-limit-ce' into 'master'

Backport some changes from EE

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

Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"

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

Fix a typo in Gitlab::Git::Repository

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