diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 23:19:08 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-21 18:57:49 +0300 |
commit | 1bf82c2b7fe0ec16b9d0f969db4b4dba4a5db1de (patch) | |
tree | 27b4c4b92c0361bbfec6ce3ec9b93bae796db92b /app/assets/javascripts | |
parent | cfa3d881a765feb04c9eaa20af40a9286b08a25b (diff) |
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
Diffstat (limited to 'app/assets/javascripts')
0 files changed, 0 insertions, 0 deletions