Merge remote-tracking branch 'origin/master' into pre-main-jh

.gitlab/CODEOWNERS

.gitlab/ci/rails.gitlab-ci.yml

.gitlab/ci/rails/shared.gitlab-ci.yml

.rubocop_todo/gitlab/service_response.yml

.rubocop_todo/layout/argument_alignment.yml

.rubocop_todo/rspec/context_wording.yml

.rubocop_todo/rspec/expect_change.yml

.rubocop_todo/rspec/scattered_let.yml

.rubocop_todo/style/if_unless_modifier.yml

CHANGELOG.md

GITALY_SERVER_VERSION

GITLAB_SHELL_VERSION

Gemfile

Gemfile.checksum

Gemfile.lock

...s/javascripts/diffs/components/shared/findings_drawer.vue

app/assets/javascripts/emoji/components/category.vue

app/assets/javascripts/emoji/components/emoji_group.vue

app/assets/javascripts/import_entities/constants.js

...ties/import_projects/components/import_projects_table.vue