Commit 1147f640 authored by Jacob Schatz's avatar Jacob Schatz

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
parents 0f22a3a2 e7221ad6
...@@ -82,6 +82,7 @@ v 8.9.0 (unreleased) ...@@ -82,6 +82,7 @@ v 8.9.0 (unreleased)
- Projects pending deletion will render a 404 page - Projects pending deletion will render a 404 page
- Measure queue duration between gitlab-workhorse and Rails - Measure queue duration between gitlab-workhorse and Rails
- Added Gfm autocomplete for labels - 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 - Make Omniauth providers specs to not modify global configuration
- Remove unused JiraIssue class and replace references with ExternalIssue. !4659 (Ilan Shamir) - 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 - Make authentication service for Container Registry to be compatible with < Docker 1.11
......
...@@ -28,8 +28,12 @@ ...@@ -28,8 +28,12 @@
.key &#8984; shift p .key &#8984; shift p
- else - else
.key ctrl shift p .key ctrl shift p
%td Toggle Markdown preview %td Toggle Markdown preview
%tr
%td.shortcut
.key
%i.fa.fa-arrow-up
%td Edit last comment (when focused on an empty textarea)
%tbody %tbody
%tr %tr
%th %th
......
doc/workflow/shortcuts.png

88.8 KB | W: | H:

doc/workflow/shortcuts.png

106 KB | W: | H:

doc/workflow/shortcuts.png
doc/workflow/shortcuts.png
doc/workflow/shortcuts.png
doc/workflow/shortcuts.png
  • 2-up
  • Swipe
  • Onion skin
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