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 /Gemfile | |
| 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 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -251,7 +251,8 @@ group :development, :test do # PhantomJS driver for Capybara gem 'poltergeist', '~> 1.5.1' - gem 'jasmine', '2.0.2' + gem 'jasmine', '~> 2.2.0' + gem 'jasmine-rails' gem "spring", '~> 1.3.1' gem "spring-commands-rspec", '1.0.4' |