summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-05-21 11:52:38 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-05-21 11:52:38 +0000
commitd5159b9c58389ce75ce5ee24e3cab14fb86ff5a4 (patch)
treeda0b0665a0d52b7278283509a2955a6a15c9bf2e
parent3834040aa8a9415864c07c8edb86ebb290e08b01 (diff)
parentf2479b608c042b2c4a7b85e38da92834c5c5ceb2 (diff)
downloadgitlab-ce-d5159b9c58389ce75ce5ee24e3cab14fb86ff5a4.tar.gz
Merge branch 'jr-web-ide-shortcuts' into 'master'
Add web shortcut to docs and shortcut modal Closes #46385 See merge request gitlab-org/gitlab-ce!19044
-rw-r--r--app/views/help/_shortcuts.html.haml11
-rw-r--r--changelogs/unreleased/jr-web-ide-shortcuts.yml5
-rw-r--r--doc/workflow/shortcuts.md6
3 files changed, 22 insertions, 0 deletions
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index 2244d16f0a6..9a3a03a7671 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -231,6 +231,17 @@
%td.shortcut
.key y
%td Go to file permalink
+ %tbody
+ %tr
+ %th
+ %th Web IDE
+ %tr
+ %td.shortcut
+ - if browser.platform.mac?
+ .key &#8984; p
+ - else
+ .key ctrl p
+ %td Go to file
.col-lg-4
%table.shortcut-mappings
%tbody.hidden-shortcut.network{ style: 'display:none' }
diff --git a/changelogs/unreleased/jr-web-ide-shortcuts.yml b/changelogs/unreleased/jr-web-ide-shortcuts.yml
new file mode 100644
index 00000000000..a895eab432a
--- /dev/null
+++ b/changelogs/unreleased/jr-web-ide-shortcuts.yml
@@ -0,0 +1,5 @@
+---
+title: Add shortcuts to Web IDE docs and modal
+merge_request: 19044
+author:
+type: changed
diff --git a/doc/workflow/shortcuts.md b/doc/workflow/shortcuts.md
index 930f2e73683..c99505e6bdf 100644
--- a/doc/workflow/shortcuts.md
+++ b/doc/workflow/shortcuts.md
@@ -88,3 +88,9 @@ You can see GitLab's keyboard shortcuts by using 'shift + ?'
| Keyboard Shortcut | Description |
| ----------------- | ----------- |
| <kbd>e</kbd> | Edit wiki page|
+
+## Web IDE
+
+| Keyboard Shortcut | Description |
+| ----------------- | ----------- |
+| <kbd>⌘</kbd> + <kbd>p</kbd> | Go to file |