Fix 500 error when loading an invalid upload URL

Closes gitlab-ee#4998

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

Revert "Merge branch 'tc-info-version-check' into 'master'"

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

Resolve "document where user clone/fetch activity appears in the logs"

Closes #43416

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

Harmonize CE and EE JS code

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

Resolve "ActionView::Template::Error: 366..524 out of range"

Closes #42332

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

Resolve "Spec failure: spec/features/users_spec.rb"

Closes #43495

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

Backport of Webpack auto include for EE imports

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Rugged sometimes chops a context line in between bytes, resulting in the context
line having an invalid encoding: https://github.com/libgit2/rugged/issues/716

When that happens, we will try to detect the encoding for the diff, and
sometimes we'll get it wrong. If that difference in encoding results in a
difference in string lengths between the diff and the underlying blobs, we'd
fail to highlight any inline diffs, and return a 500 status to the user.

As we're using the underlying blobs, the encoding is 'correct' anyway, so if the
string range is invalid, we can just discard the inline diff highlighting. We
still report to Sentry to ensure that we can investigate further in future.

Signed-off-by: Rémy Coutable <remy@rymai.me>

Fix squash with renamed files

Closes gitlab-ee#4975

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

Allow branchnames to be named the same as the commit it points to

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

Format markdown.md to comply with what it describes.

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

[ci skip]

Add more detail to the proofreader process

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

Resolve "Followup to New design for cancel/stop pipeline confirmation"

Closes #42886

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

[CE] Incorporate Gitaly's RepositoryService.IsSquashInProgress RPC

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

Resolve "Controller Projects::PipelinesController#show executes more than 100 SQL queries"

Closes #43134

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

When the text says "here are two spaces to force a line break"
there really should be two spaces to force a line break.

Fix repo existence check in GitAccessWiki

Closes #43385 and gitlab-com/infrastructure#3734

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

Improve background migration specs

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

Use dynamic imports in dispatcher

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

Improve link for CI environment variable, wording.

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

Rest of Dispatcher Refactor

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

Use dynamic imports for project dispatcher paths

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

Adds a test where a branch name is also a valid commit id. Git, the
binary should create an error message which is difficult to parse and
leading to errors later, as seen in: gitlab-org/gitlab-ce#43222

To catch these cases in the future,
gitlab-test@1942eed5cc108b19c7405106e81fa96125d0be22 was created. Which
a branch name matching the commit