summaryrefslogtreecommitdiff
path: root/doc/workflow
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-10-31 16:08:11 -0500
committerMike Greiling <mike@pixelcog.com>2017-10-31 16:08:11 -0500
commit1cf167fc3e61c6c78e3bf2ba15a02f7ab317294c (patch)
tree05fda8866fb5634be495b526d06f00f02b18ea35 /doc/workflow
parentc73c1a20e3c5a66a71758c4809faf2f69df25392 (diff)
parent0134079430f0179c527d388539c0986352bca9bd (diff)
downloadgitlab-ce-1cf167fc3e61c6c78e3bf2ba15a02f7ab317294c.tar.gz
Merge branch 'master' into sh-headless-chrome-support
* master: (84 commits) Migrate Gitlab::Git::Wiki#page to Gitaly Load participants async Normalize LDAP DN when looking up identity Improve the maintenance policy page add changelog fix spec failure Allow promoting project milestones to group milestones fix specs Be able to bundle gems with newer rubies Upgrade Ruby to 2.3.5 fixed up upload feature after master merge fix missing issue assignees Migrate Gitlab::Git::Wiki#delete_page to Gitaly Enable eslint Make `#hashed_storage?` require feature argument Adds callback function to inital cluster request Fix example typo. Upload files through the multi-file editor get branch name from the DOM Resolve "Convert autosize.js library to be a Yarn managed library" ...
Diffstat (limited to 'doc/workflow')
-rw-r--r--doc/workflow/shortcuts.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/workflow/shortcuts.md b/doc/workflow/shortcuts.md
index 87416008e98..2e1bd6bfe5c 100644
--- a/doc/workflow/shortcuts.md
+++ b/doc/workflow/shortcuts.md
@@ -9,7 +9,7 @@ You can see GitLab's keyboard shortcuts by using 'shift + ?'
| <kbd>n</kbd> | Main navigation |
| <kbd>s</kbd> | Focus search |
| <kbd>f</kbd> | Focus filter |
-| <kbd>p b</kbd> | Show/hide the Performance Bar |
+| <kbd>p</kbd> + <kbd>b</kbd> | Show/hide the Performance Bar |
| <kbd>?</kbd> | Show/hide this dialog |
| <kbd>⌘</kbd> + <kbd>shift</kbd> + <kbd>p</kbd> | Toggle markdown preview |
| <kbd>↑</kbd> | Edit last comment (when focused on an empty textarea) |