# Conflicts:
#   db/schema.rb

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

Update Browser Performance Testing Example

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

Optimize and improve the inline documentation for the codequality job

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

#28481: Display time tracking totals on milestone page

Closes #28481

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

Resolve "[Gem Update] update toml-rb to 1.0.0"

Closes #36847

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

Add missing pagination on the commit diff endpoint

Closes #43370

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

Be more transparent about the version check

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

Fix new project path input overlapping, height and radius #41811

Closes #41811

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

Apply new default and inline label design #34725

Closes #34725

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

Resolve "Update to github-linguist 5.3.x"

Closes #26039

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

Fixes an invalid documentation for the .gitlab-ci.yml cache:key

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