diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 16:03:24 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 16:03:24 +0200 |
| commit | bbd8525d75d6dba4dd6f5dc996073e61f47e43dc (patch) | |
| tree | 1e941c9e4d28f34d525a4a01103ee46ca1ec253c /Gemfile.lock | |
| parent | 5a2ae296fafb434e9f6a72118b02ddc1f584a9a9 (diff) | |
| download | gitlab-ce-bbd8525d75d6dba4dd6f5dc996073e61f47e43dc.tar.gz | |
Update jasmine gem to work with rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index dac2f85ce26..4913eafff6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,8 +74,6 @@ GEM celluloid (0.15.2) timers (~> 1.1.0) charlock_holmes (0.6.9.4) - childprocess (0.3.9) - ffi (~> 1.0, >= 1.0.11) chosen-rails (1.0.1) coffee-rails (>= 3.2) compass-rails (>= 1.0) @@ -255,12 +253,12 @@ GEM httpauth (0.2.0) i18n (0.6.9) ice_nine (0.10.0) - jasmine (1.3.2) - jasmine-core (~> 1.3.1) - rack (~> 1.0) - rspec (>= 1.3.1) - selenium-webdriver (>= 0.1.3) - jasmine-core (1.3.1) + jasmine (2.0.0.rc5) + jasmine-core (~> 2.0.0.rc5) + phantomjs + rack (>= 1.2.1) + rake + jasmine-core (2.0.0.rc5) jquery-atwho-rails (0.4.1) jquery-rails (2.1.3) railties (>= 3.1.0, < 5.0) @@ -332,6 +330,7 @@ GEM omniauth-oauth (~> 1.0) orm_adapter (0.5.0) pg (0.15.1) + phantomjs (1.9.2.0) poltergeist (1.4.1) capybara (~> 2.1.0) cliver (~> 0.2.1) @@ -354,8 +353,6 @@ GEM rack (>= 0.4) rack-attack (2.3.0) rack - rack-cache (1.2) - rack (>= 0.4) rack-cors (0.2.9) rack-mini-profiler (0.1.31) rack (>= 1.1.3) @@ -439,7 +436,6 @@ GEM ruby-hmac (0.4.0) ruby-progressbar (1.2.0) rubyntlm (0.1.1) - rubyzip (1.0.0) safe_yaml (0.9.7) sanitize (2.0.6) nokogiri (>= 1.4.4) @@ -456,11 +452,6 @@ GEM activesupport (>= 3.1, < 4.1) select2-rails (3.5.2) thor (~> 0.14) - selenium-webdriver (2.37.0) - childprocess (>= 0.2.5) - multi_json (~> 1.0) - rubyzip (~> 1.0.0) - websocket (~> 1.0.4) settingslogic (2.0.9) sexp_processor (4.4.0) shoulda-matchers (2.1.0) @@ -560,7 +551,6 @@ GEM webmock (1.16.0) addressable (>= 2.2.7) crack (>= 0.3.2) - websocket (1.0.7) websocket-driver (0.3.1) xpath (2.0.0) nokogiri (~> 1.3) @@ -616,7 +606,7 @@ DEPENDENCIES haml-rails hipchat (~> 0.9.0) httparty - jasmine + jasmine (= 2.0.0.rc5) jquery-atwho-rails (~> 0.4.1) jquery-rails (= 2.1.3) jquery-turbolinks |