From ef7cfdceea0355c0e9c434ec3fc2b9915979da5e Mon Sep 17 00:00:00 2001
From: Marin Jankovski <marin@gitlab.com>
Date: Mon, 2 Jun 2014 17:04:59 +0200
Subject: [PATCH] Update jasmine.
---
Gemfile | 2 +-
Gemfile.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Gemfile b/Gemfile
index f3791e95986..5b45b8bdcc2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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
--
GitLab