diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index 4b9304cfdb9a7c66a4d0900447a265a4721fe122..aa63127049c9cf6a8a8511e06db58845ef73ff16 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -65,25 +65,23 @@
%tbody
%tr
%th
- %th= _('Web IDE')
+ %th= _('Editing')
%tr
%td.shortcut
- if browser.platform.mac?
- %kbd ⌘ p
+ %kbd ⌘ shift p
- else
- %kbd ctrl p
- %td= _('Go to file')
+ %kbd ctrl shift p
+ %td= _('Toggle Markdown preview')
%tr
%td.shortcut
- - if browser.platform.mac?
- %kbd ⌘ enter
- - else
- %kbd ctrl enter
- %td= _('Commit (when editing commit message)')
+ %kbd
+ %i.fa.fa-arrow-up
+ %td= _('Edit your most recent comment in a thread (from an empty textarea)')
%tbody
%tr
%th
- %th= _('Wiki pages')
+ %th= _('Wiki')
%tr
%td.shortcut
%kbd e
@@ -91,19 +89,49 @@
%tbody
%tr
%th
- %th= _('Editing')
+ %th= _('Repository Graph')
%tr
%td.shortcut
- - if browser.platform.mac?
- %kbd ⌘ shift p
- - else
- %kbd ctrl shift p
- %td= _('Toggle Markdown preview')
+ %kbd
+ %i.fa.fa-arrow-left
+ \/
+ %kbd h
+ %td= _('Scroll left')
+ %tr
+ %td.shortcut
+ %kbd
+ %i.fa.fa-arrow-right
+ \/
+ %kbd l
+ %td= _('Scroll right')
%tr
%td.shortcut
%kbd
%i.fa.fa-arrow-up
- %td= _('Edit your most recent comment in a thread (from an empty textarea)')
+ \/
+ %kbd k
+ %td= _('Scroll up')
+ %tr
+ %td.shortcut
+ %kbd
+ %i.fa.fa-arrow-down
+ \/
+ %kbd j
+ %td= _('Scroll down')
+ %tr
+ %td.shortcut
+ %kbd
+ shift
+ %i.fa.fa-arrow-up
+ \/ k
+ %td= _('Scroll to top')
+ %tr
+ %td.shortcut
+ %kbd
+ shift
+ %i.fa.fa-arrow-down
+ \/ j
+ %td= _('Scroll to bottom')
.col-lg-4
%table.shortcut-mappings.text-2
%tbody
@@ -229,15 +257,7 @@
%tbody
%tr
%th
- %th= _('Issues / Merge Requests')
- %tr
- %td.shortcut
- %kbd a
- %td= _('Change assignee')
- %tr
- %td.shortcut
- %kbd m
- %td= _('Change milestone')
+ %th= _('Epics, Issues, and Merge Requests')
%tr
%td.shortcut
%kbd r
@@ -250,92 +270,64 @@
%td.shortcut
%kbd l
%td= _('Change label')
+ %tbody
+ %tr
+ %th
+ %th= _('Issues and Merge Requests')
+ %tr
+ %td.shortcut
+ %kbd a
+ %td= _('Change assignee')
+ %tr
+ %td.shortcut
+ %kbd m
+ %td= _('Change milestone')
+ %tbody
+ %tr
+ %th
+ %th= _('Merge Requests')
%tr
%td.shortcut
%kbd ]
\/
%kbd j
- %td= _('Next file in diff (MRs only)')
+ %td= _('Next file in diff')
%tr
%td.shortcut
%kbd [
\/
%kbd k
- %td= _('Previous file in diff (MRs only)')
+ %td= _('Previous file in diff')
%tr
%td.shortcut
- if browser.platform.mac?
%kbd ⌘ p
- else
%kbd ctrl p
- %td= _('Go to file (MRs only)')
+ %td= _('Go to file')
%tr
%td.shortcut
%kbd n
- %td= _('Next unresolved discussion (MRs only)')
+ %td= _('Next unresolved discussion')
%tr
%td.shortcut
%kbd p
- %td= _('Previous unresolved discussion (MRs only)')
+ %td= _('Previous unresolved discussion')
%tbody
%tr
%th
- %th= _('Epics (Ultimate / Gold license only)')
- %tr
- %td.shortcut
- %kbd r
- %td= _('Comment/Reply (quoting selected text)')
- %tr
- %td.shortcut
- %kbd e
- %td= _('Edit epic description')
- %tr
- %td.shortcut
- %kbd l
- %td= _('Change label')
- %tbody
- %tr
- %th
- %th= _('Repository Graph')
- %tr
- %td.shortcut
- %kbd
- %i.fa.fa-arrow-left
- \/
- %kbd h
- %td= _('Scroll left')
- %tr
- %td.shortcut
- %kbd
- %i.fa.fa-arrow-right
- \/
- %kbd l
- %td= _('Scroll right')
- %tr
- %td.shortcut
- %kbd
- %i.fa.fa-arrow-up
- \/
- %kbd k
- %td= _('Scroll up')
- %tr
- %td.shortcut
- %kbd
- %i.fa.fa-arrow-down
- \/
- %kbd j
- %td= _('Scroll down')
+ %th= _('Web IDE')
%tr
%td.shortcut
- %kbd
- shift
- %i.fa.fa-arrow-up
- \/ k
- %td= _('Scroll to top')
+ - if browser.platform.mac?
+ %kbd ⌘ p
+ - else
+ %kbd ctrl p
+ %td= _('Go to file')
%tr
%td.shortcut
- %kbd
- shift
- %i.fa.fa-arrow-down
- \/ j
- %td= _('Scroll to bottom')
+ - if browser.platform.mac?
+ %kbd ⌘ enter
+ - else
+ %kbd ctrl enter
+ %td= _('Commit (when editing commit message)')
diff --git a/changelogs/unreleased/feature-refactor-keyboard-shortcuts-modal.yml b/changelogs/unreleased/feature-refactor-keyboard-shortcuts-modal.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5dea0db0fba08caeb005b38bc526a04040bb6a41
--- /dev/null
+++ b/changelogs/unreleased/feature-refactor-keyboard-shortcuts-modal.yml
@@ -0,0 +1,5 @@
+---
+title: Clean up & Re-arrange the keyboard shortcuts modal
+merge_request: 28992
+author:
+type: other
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 6d533c41bf6542de3591bdaff470fc7294b7a05d..043497a430a7df764a1abee73200f0ab2aa27f25 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7490,9 +7490,6 @@ msgstr ""
msgid "Edit environment"
msgstr ""
-msgid "Edit epic description"
-msgstr ""
-
msgid "Edit file"
msgstr ""
@@ -8114,9 +8111,6 @@ msgstr ""
msgid "Epics"
msgstr ""
-msgid "Epics (Ultimate / Gold license only)"
-msgstr ""
-
msgid "Epics Roadmap"
msgstr ""
@@ -8126,6 +8120,9 @@ msgstr ""
msgid "Epics let you manage your portfolio of projects more efficiently and with less effort"
msgstr ""
+msgid "Epics, Issues, and Merge Requests"
+msgstr ""
+
msgid "Epics|Add an epic"
msgstr ""
@@ -10013,9 +10010,6 @@ msgstr ""
msgid "Go to file"
msgstr ""
-msgid "Go to file (MRs only)"
-msgstr ""
-
msgid "Go to file permalink (while viewing a file)"
msgstr ""
@@ -11441,15 +11435,15 @@ msgstr ""
msgid "Issues"
msgstr ""
-msgid "Issues / Merge Requests"
-msgstr ""
-
msgid "Issues Analytics"
msgstr ""
msgid "Issues Rate Limits"
msgstr ""
+msgid "Issues and Merge Requests"
+msgstr ""
+
msgid "Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable."
msgstr ""
@@ -13538,10 +13532,10 @@ msgstr ""
msgid "Next"
msgstr ""
-msgid "Next file in diff (MRs only)"
+msgid "Next file in diff"
msgstr ""
-msgid "Next unresolved discussion (MRs only)"
+msgid "Next unresolved discussion"
msgstr ""
msgid "Nickname"
@@ -15208,10 +15202,10 @@ msgstr ""
msgid "Previous Artifacts"
msgstr ""
-msgid "Previous file in diff (MRs only)"
+msgid "Previous file in diff"
msgstr ""
-msgid "Previous unresolved discussion (MRs only)"
+msgid "Previous unresolved discussion"
msgstr ""
msgid "Primary"
@@ -23391,9 +23385,6 @@ msgstr ""
msgid "Wiki"
msgstr ""
-msgid "Wiki pages"
-msgstr ""
-
msgid "Wiki was successfully updated."
msgstr ""