diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 20:21:05 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 20:21:05 +0000 |
| commit | fc63251fd579b4cc285056442016d500e14e2a11 (patch) | |
| tree | 373dfce466cf951f6660b2b4e27a6d93b2fc4622 /app/assets/stylesheets/framework/markdown_area.scss | |
| parent | 9e56cdb57a80365ad7bb0d859d942d7fbf2cf1c6 (diff) | |
| parent | 544ad086da7dd27dbb2f6ba750065f63b2e126e0 (diff) | |
| download | gitlab-ce-fc63251fd579b4cc285056442016d500e14e2a11.tar.gz | |
Merge branch 'lbennett/gitlab-ce-18113-edit-note-shortcut-conflicting' into 'master'
Stop edit note up key shortcut conflicting with native shortcuts
## What does this MR do?
Restricts edit note shortcut to only the `up` button, if modifier keys are used it will not fire the shortcut.
## Are there points in the code the reviewer needs to double check?
Ney.
## Why was this MR needed?
UX
## What are the relevant issue numbers?
Closes #18113.
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [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 !4761
Diffstat (limited to 'app/assets/stylesheets/framework/markdown_area.scss')
0 files changed, 0 insertions, 0 deletions