diff options
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 7 insertions, 7 deletions
@@ -251,12 +251,12 @@ group :development, :test do # PhantomJS driver for Capybara gem 'poltergeist', '~> 1.5.1' - gem 'jasmine', '2.0.2' + gem 'jasmine', '~> 2.2.0' gem "spring", '~> 1.3.1' gem "spring-commands-rspec", '1.0.4' gem "spring-commands-spinach", '1.0.0' - + gem "byebug" end diff --git a/Gemfile.lock b/Gemfile.lock index bfe626521e7..ab424c3777c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -292,12 +292,12 @@ 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) jquery-atwho-rails (0.3.3) jquery-rails (3.1.0) railties (>= 3.0, < 5.0) @@ -391,7 +391,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) @@ -717,7 +717,7 @@ DEPENDENCIES hipchat (~> 1.4.0) html-pipeline-gitlab (~> 0.1) httparty - jasmine (= 2.0.2) + jasmine (~> 2.2.0) jquery-atwho-rails (~> 0.3.3) jquery-rails jquery-scrollto-rails |