diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-22 22:57:40 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-04-22 22:57:40 +0300 |
| commit | a22f3139f3f3d37531cc5ed75fea3c9aa6f257ef (patch) | |
| tree | ef1a5cb3f7bc4d46b9e0c665d95625e910bffed4 /config | |
| parent | b5ee60c51263c981098d3268a8cb7105376651fa (diff) | |
| parent | 3ae0b8853b6f1169e0341c091d8a4e1b13aac3ad (diff) | |
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 'config')
| -rw-r--r-- | config/routes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 744a99feded..82b376aecbc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,7 @@ require 'sidekiq/web' require 'api/api' Gitlab::Application.routes.draw do + mount JasmineRails::Engine => '/specs' if defined?(JasmineRails) use_doorkeeper do controllers applications: 'oauth/applications', authorized_applications: 'oauth/authorized_applications', |