diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-06-02 17:04:59 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-06-03 11:39:29 +0200 |
| commit | ef7cfdceea0355c0e9c434ec3fc2b9915979da5e (patch) | |
| tree | 68207de8a36e775053a02d5265636098de0aeb93 | |
| parent | 209726917b1231e02bf77f1f5ee71cbc95f94853 (diff) | |
| download | gitlab-ce-ef7cfdceea0355c0e9c434ec3fc2b9915979da5e.tar.gz | |
Update jasmine.
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -224,7 +224,7 @@ group :development, :test do # PhantomJS driver for Capybara gem 'poltergeist', '~> 1.5.1' - gem 'jasmine', '2.0.0.rc5' + gem 'jasmine', '2.0.2' gem "spring", '1.1.1' gem "spring-commands-rspec", '1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 60f1dd0a212..416c4985f91 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -244,12 +244,12 @@ GEM httpauth (0.2.0) i18n (0.6.9) ice_nine (0.10.0) - jasmine (2.0.0.rc5) - jasmine-core (~> 2.0.0.rc5) + jasmine (2.0.2) + jasmine-core (~> 2.0.0) phantomjs rack (>= 1.2.1) rake - jasmine-core (2.0.0.rc5) + jasmine-core (2.0.0) jquery-atwho-rails (0.3.3) jquery-rails (3.1.0) railties (>= 3.0, < 5.0) @@ -617,7 +617,7 @@ DEPENDENCIES haml-rails hipchat (~> 0.14.0) httparty - jasmine (= 2.0.0.rc5) + jasmine (= 2.0.2) jquery-atwho-rails (~> 0.3.3) jquery-rails jquery-scrollto-rails |