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.lock | |
| 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.lock')
| -rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8679da009c2..d905ac927fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -287,12 +287,17 @@ GEM i18n (0.7.0) ice_cube (0.11.1) ice_nine (0.10.0) - jasmine (2.0.2) - jasmine-core (~> 2.0.0) + jasmine (2.2.0) + jasmine-core (~> 2.2) phantomjs rack (>= 1.2.1) rake - jasmine-core (2.0.0) + jasmine-core (2.2.0) + jasmine-rails (0.10.8) + jasmine-core (>= 1.3, < 3.0) + phantomjs (>= 1.9) + railties (>= 3.2.0) + sprockets-rails jquery-atwho-rails (0.3.3) jquery-rails (3.1.0) railties (>= 3.0, < 5.0) @@ -387,7 +392,7 @@ GEM parser (2.2.0.2) ast (>= 1.1, < 3.0) pg (0.15.1) - phantomjs (1.9.2.0) + phantomjs (1.9.8.0) poltergeist (1.5.1) capybara (~> 2.1) cliver (~> 0.3.1) @@ -713,7 +718,8 @@ DEPENDENCIES hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) httparty - jasmine (= 2.0.2) + jasmine (~> 2.2.0) + jasmine-rails jquery-atwho-rails (~> 0.3.3) jquery-rails jquery-scrollto-rails |