Merge branch 'sf/fix/429807-add-keyboard-shortcut-for-compare-view' into 'master'

Add keyboard shortcut for compare button

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135465



Merged-by: Artur Fedorov <afedorov@gitlab.com>
Approved-by: Jon Glassman <jglassman@gitlab.com>
Approved-by: Diana Zubova <dzubova@gitlab.com>
Approved-by: Artur Fedorov <afedorov@gitlab.com>
Co-authored-by: Jon Glassman <jglassman@gitlab.com>
Co-authored-by: Sam Figueroa <sfigueroa@gitlab.com>

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

@@ -381,6 +381,12 @@ export const PROJECT_FILES_GO_TO_PERMALINK = {
   defaultKeys: ['y'],
 };
 
+export const PROJECT_FILES_GO_TO_COMPARE = {
+  id: 'projectFiles.goToCompare',
+  description: __('Compare Branches'),
+  defaultKeys: ['shift+c'],
+};
+
 export const ISSUABLE_COMMENT_OR_REPLY = {
   id: 'issuables.commentReply',
   description: __('Comment/Reply (quoting selected text)'),
@@ -606,6 +612,7 @@ const PROJECT_FILES_SHORTCUTS_GROUP = {
     PROJECT_FILES_OPEN_SELECTION,
     PROJECT_FILES_GO_BACK,
     PROJECT_FILES_GO_TO_PERMALINK,
+    PROJECT_FILES_GO_TO_COMPARE,
   ],
 };
 

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

@@ -18,6 +18,7 @@ import {
   GO_TO_PROJECT_KUBERNETES,
   GO_TO_PROJECT_ENVIRONMENTS,
   GO_TO_PROJECT_WEBIDE,
+  PROJECT_FILES_GO_TO_COMPARE,
   NEW_ISSUE,
 } from './keybindings';
 import Shortcuts from './shortcuts';
@@ -43,6 +44,7 @@ export default class ShortcutsNavigation extends Shortcuts {
       [GO_TO_PROJECT_SNIPPETS, () => findAndFollowLink('.shortcuts-snippets')],
       [GO_TO_PROJECT_KUBERNETES, () => findAndFollowLink('.shortcuts-kubernetes')],
       [GO_TO_PROJECT_ENVIRONMENTS, () => findAndFollowLink('.shortcuts-environments')],
+      [PROJECT_FILES_GO_TO_COMPARE, () => findAndFollowLink('.shortcuts-compare')],
       [GO_TO_PROJECT_WEBIDE, ShortcutsNavigation.navigateToWebIDE],
       [NEW_ISSUE, () => findAndFollowLink('.shortcuts-new-issue')],
     ]);

doc/user/shortcuts.md

@@ -135,6 +135,7 @@ These shortcuts are available when browsing the files in a project (go to
 | <kbd>Enter</kbd>  | Open selection. |
 | <kbd>Escape</kbd> | Go back to file list screen (only while searching for files, **Code > Repository**, then select **Find File**). |
 | <kbd>y</kbd>      | Go to file permalink (only while viewing a file). |
+| <kbd>Shift</kbd> + <kbd>c</kbd>  | Go to compare branches view. |
 | <kbd>.</kbd>      | Open the [Web IDE](project/web_ide/index.md). |
 
 ### Web IDE

locale/gitlab.pot

@@ -12235,6 +12235,9 @@ msgstr ""
 msgid "Compare %{oldCommitId}...%{newCommitId}"
 msgstr ""
+msgid "Compare Branches"
+msgstr ""
+
 msgid "Compare GitLab editions"
 msgstr ""