Files
gitlabhq/app/assets/javascripts
Jacob Schatz fc63251fd5 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
2016-06-20 20:21:05 +00:00
..
2016-06-07 15:27:30 -06:00
2016-05-20 15:58:36 -05:00
2016-03-20 10:58:59 -07:00
2016-04-21 00:20:13 +00:00
2016-04-06 11:08:40 +01:00
2016-06-03 17:14:23 -05:00
2014-12-30 11:46:48 +02:00
2016-04-18 13:45:26 +01:00
2016-03-10 13:54:54 +00:00
2016-06-16 12:53:21 -05:00
2016-06-14 17:53:26 +01:00
2016-03-10 13:55:01 +01:00
2016-06-17 18:31:37 +01:00
2016-04-26 09:03:04 +01:00
2016-06-15 18:33:18 +01:00
2016-06-09 17:19:14 +01:00
2015-10-06 11:43:32 +03:00
2016-03-03 13:09:58 +01:00