diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-22 19:57:40 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-22 19:57:40 +0000 |
| commit | a22f3139f3f3d37531cc5ed75fea3c9aa6f257ef (patch) | |
| tree | ef1a5cb3f7bc4d46b9e0c665d95625e910bffed4 /app/views/help | |
| parent | b5ee60c51263c981098d3268a8cb7105376651fa (diff) | |
| parent | 3ae0b8853b6f1169e0341c091d8a4e1b13aac3ad (diff) | |
| download | gitlab-ce-a22f3139f3f3d37531cc5ed75fea3c9aa6f257ef.tar.gz | |
Merge branch 'rs-reply-hotkey' into 'master'
"Reply quoting selected text" shortcut/hotkey
Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms.
This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs.
See merge request !1775
Diffstat (limited to 'app/views/help')
| -rw-r--r-- | app/views/help/_shortcuts.html.haml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml index 7b21ca30d8c..ae072bacfb1 100644 --- a/app/views/help/_shortcuts.html.haml +++ b/app/views/help/_shortcuts.html.haml @@ -187,7 +187,11 @@ %td.shortcut .key m %td Change milestone - %tbody{ class: 'hidden-shortcut merge_reuests', style: 'display:none' } + %tr + %td.shortcut + .key r + %td Reply (quoting selected text) + %tbody{ class: 'hidden-shortcut merge_requests', style: 'display:none' } %tr %th %th Merge Requests @@ -199,6 +203,10 @@ %td.shortcut .key m %td Change milestone + %tr + %td.shortcut + .key r + %td Reply (quoting selected text) :javascript |