diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 18:21:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 18:21:10 +0300 |
commit | e33f87ac0fabaab468ce4b457996cc0f1b1bb648 (patch) | |
tree | 8bf0de72a9acac014cfdaddab7d463b208294af2 /app/views/help | |
parent | 5baf990db20a75078684702782c24399ef9eb0fa (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/help')
-rw-r--r-- | app/views/help/_shortcuts.html.haml | 164 |
1 files changed, 78 insertions, 86 deletions
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml index 4b9304cfdb9..aa63127049c 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)') |