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

.rubocop_todo/style/empty_method.yml

CHANGELOG.md

Gemfile

Gemfile.checksum

Gemfile.lock

Gemfile.next.checksum

Gemfile.next.lock

app/assets/javascripts/behaviors/shortcuts/keybindings.js

...ascripts/ci/pipeline_new/components/pipeline_new_form.vue

app/assets/javascripts/diffs/components/app.vue

app/assets/javascripts/diffs/components/compare_versions.vue

...assets/javascripts/diffs/components/diff_app_controls.vue

app/assets/javascripts/diffs/components/diff_stats.vue

app/assets/javascripts/diffs/store/actions.js

app/assets/javascripts/diffs/store/mutation_types.js

app/assets/javascripts/diffs/store/mutations.js

app/assets/javascripts/diffs/stores/legacy_diffs/actions.js

...assets/javascripts/diffs/stores/legacy_diffs/mutations.js

app/assets/javascripts/helpers/diffs_helper.js

...rge_request_dashboard/components/merge_requests_query.vue