Skip to content

G
gitlab-ce
Commit 3f3e47c0 authored by Mark Florian's avatar Mark Florian
Browse files
Options

Merge branch... 

Merge branch '18140-add-to-next-and-previous-commit-buttons-when-viewing-commits-in-merge-request-3' into 'master'

Clean up & Re-arrange the keyboard shortcuts modal

See merge request gitlab-org/gitlab!28992
parents 6147fdcd e88dfcad
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 105 deletions
app/views/help/_shortcuts.html.haml
View file @ 3f3e47c0
......@@ -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)')
changelogs/unreleased/feature-refactor-keyboard-shortcuts-modal.yml 0 → 100644
View file @ 3f3e47c0
---
title: Clean up & Re-arrange the keyboard shortcuts modal
merge_request: 28992
author:
type: other
locale/gitlab.pot
View file @ 3f3e47c0
......@@ -7520,9 +7520,6 @@ msgstr ""
msgid "Edit environment"
msgstr ""
msgid "Edit epic description"
msgstr ""
msgid "Edit file"
msgstr ""
......@@ -8144,9 +8141,6 @@ msgstr ""
msgid "Epics"
msgstr ""
msgid "Epics (Ultimate / Gold license only)"
msgstr ""
msgid "Epics Roadmap"
msgstr ""
......@@ -8156,6 +8150,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 ""
......@@ -10046,9 +10043,6 @@ msgstr ""
msgid "Go to file"
msgstr ""
msgid "Go to file (MRs only)"
msgstr ""
msgid "Go to file permalink (while viewing a file)"
msgstr ""
......@@ -11477,15 +11471,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 ""
......@@ -13580,10 +13574,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"
......@@ -15253,10 +15247,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"
......@@ -23445,9 +23439,6 @@ msgstr ""
msgid "Wiki"
msgstr ""
msgid "Wiki pages"
msgstr ""
msgid "Wiki was successfully updated."
msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7