diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-04-18 14:00:56 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-18 15:17:24 -0400 |
| commit | 7679c500abb8f6dff4c49a7dec1b1643a4aedeb0 (patch) | |
| tree | cddc44bc630af40d4f0e2580267fd03cd5b80a7f /Gemfile.lock | |
| parent | 7d5fefb780a62d063c3bbf5b050910c5542d64c1 (diff) | |
| download | gitlab-ce-7679c500abb8f6dff4c49a7dec1b1643a4aedeb0.tar.gz | |
Update jasmine gem
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
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 |