From 5622f7242009b3f67e26e3d2b38feaa78df468d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 24 Nov 2014 16:44:39 +0100
Subject: [PATCH] bump jasmine

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 77d32c4b2..ac54190ab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -240,7 +240,7 @@ group :development, :test do
   gem 'cucumber-rails',     '1.4.2', :require => false
 
   # Jasmine (client side application tests (JS))
-  gem 'jasmine',              '2.0.3'
+  gem 'jasmine',              '2.1.0'
   gem 'jasmine-jquery-rails', '2.0.3'
   gem 'sinon-rails',	      '1.10.3'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 4b26acbe9..85fc83fd9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -284,12 +284,12 @@ GEM
     ice_cube (0.11.1)
     inflecto (0.0.2)
     ipaddress (0.8.0)
-    jasmine (2.0.3)
-      jasmine-core (~> 2.0.0)
+    jasmine (2.1.0)
+      jasmine-core (~> 2.1.0)
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (2.0.2)
+    jasmine-core (2.1.2)
     jasmine-jquery-rails (2.0.3)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
@@ -635,7 +635,7 @@ DEPENDENCIES
   handlebars_assets (= 0.18.0)
   http_accept_language (= 2.0.2)
   i18n-inflector-rails (= 1.0.7)
-  jasmine (= 2.0.3)
+  jasmine (= 2.1.0)
   jasmine-jquery-rails (= 2.0.3)
   jquery-rails (= 3.1.2)
   js-routes (= 0.9.9)