summaryrefslogtreecommitdiff
path: root/app/views/help
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-04-18 11:14:00 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-04-18 11:14:00 +0000
commitd2b3ed17bbf79242e7f2478b954b9cba7a3768c8 (patch)
treef09f830876efa03763d971aa1b3ebdbd1b8bfba8 /app/views/help
parent423d98d796dc21b44c890b7048763333b79a9a90 (diff)
parentffca1cc2ea0f3aeaee5c7aa3afa883489a15af12 (diff)
downloadgitlab-ce-d2b3ed17bbf79242e7f2478b954b9cba7a3768c8.tar.gz
Merge branch '29816-create-keyboard-shortcut-for-editing-wiki-page' into 'master'
Add keyboard edit shortcut for wiki Closes #29816 See merge request !10245
Diffstat (limited to 'app/views/help')
-rw-r--r--app/views/help/_shortcuts.html.haml8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index 700c5e61a14..ea8bbe92d86 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -318,3 +318,11 @@
%td.shortcut
.key l
%td Change Label
+ %tbody.hidden-shortcut.wiki{ style: 'display:none' }
+ %tr
+ %th
+ %th Wiki pages
+ %tr
+ %td.shortcut
+ .key e
+ %td Edit wiki page