diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 20:19:08 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-21 11:57:49 -0400 |
commit | 1bf82c2b7fe0ec16b9d0f969db4b4dba4a5db1de (patch) | |
tree | 27b4c4b92c0361bbfec6ce3ec9b93bae796db92b | |
parent | cfa3d881a765feb04c9eaa20af40a9286b08a25b (diff) | |
download | gitlab-ce-1bf82c2b7fe0ec16b9d0f969db4b4dba4a5db1de.tar.gz |
Merge branch 'lbennett/gitlab-ce-18114-add-up-arrow-edit-shortcut-documentation' into 'master'
Documented the up key shortcut
## What does this MR do?
Documents the `up` key edit note shortcut in the `/help/_shortcuts.html.haml` help pane and the `/doc/workflow/shortcuts.png` screenshot.
## Are there points in the code the reviewer needs to double check?
The issue and MR shortcuts should be merged, they're the same? Shall I open an issue or include here?
This panel also need to be a little more responsive. Shall I open an issue or include here?
Additionally, I have some conflicts regarding the screenshot. This screenshot also needs to update for !4570.
## Why was this MR needed?
Everyone should know about this awesome shortcut.
## What are the relevant issue numbers?
Closes #18114.
## Screenshots (if relevant)
View the [updated screenshot](https://gitlab.com/gitlab-org/gitlab-ce/blob/e7221ad66efeb0f7d263ead7ed523d194243fb09/doc/workflow/shortcuts.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4758
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/views/help/_shortcuts.html.haml | 6 | ||||
-rw-r--r-- | doc/workflow/shortcuts.png | bin | 90936 -> 108255 bytes |
3 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2be623afd80..e52f901a1aa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -82,6 +82,7 @@ v 8.9.0 (unreleased) - Projects pending deletion will render a 404 page - Measure queue duration between gitlab-workhorse and Rails - Added Gfm autocomplete for labels + - Added edit note 'up' shortcut documentation to the help panel and docs screenshot #18114 - Make Omniauth providers specs to not modify global configuration - Remove unused JiraIssue class and replace references with ExternalIssue. !4659 (Ilan Shamir) - Make authentication service for Container Registry to be compatible with < Docker 1.11 diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml index 01648047ce2..8cc0b59edeb 100644 --- a/app/views/help/_shortcuts.html.haml +++ b/app/views/help/_shortcuts.html.haml @@ -28,8 +28,12 @@ .key ⌘ shift p - else .key ctrl shift p - %td Toggle Markdown preview + %tr + %td.shortcut + .key + %i.fa.fa-arrow-up + %td Edit last comment (when focused on an empty textarea) %tbody %tr %th diff --git a/doc/workflow/shortcuts.png b/doc/workflow/shortcuts.png Binary files differindex beb6c53ec77..16be0413b64 100644 --- a/doc/workflow/shortcuts.png +++ b/doc/workflow/shortcuts.png |