From ae93a1eef2feb9f06cefba7dd1a54dc3369e82b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 24 Mar 2015 22:15:40 +0100
Subject: [PATCH] bump rails-assets-jasmine-ajax
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index a4367b50ae..99e49541f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -271,6 +271,6 @@ group :development, :test do
# Jasmine (client side application tests (JS))
gem "jasmine", "2.2.0"
gem "jasmine-jquery-rails", "2.0.3"
- gem "rails-assets-jasmine-ajax", "3.0.0", source: "https://rails-assets.org"
+ gem "rails-assets-jasmine-ajax", "3.1.0", source: "https://rails-assets.org"
gem "sinon-rails", "1.10.3"
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 10aa6e51a4..17be4f3194 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -492,7 +492,7 @@ GEM
rails-assets-jquery-ui (~> 1.10.4)
rails-assets-jquery.slimscroll (~> 1.3.3)
rails-assets-jasmine (2.2.1)
- rails-assets-jasmine-ajax (3.0.0)
+ rails-assets-jasmine-ajax (3.1.0)
rails-assets-jasmine (~> 2.0)
rails-assets-jeresig--jquery.hotkeys (0.2.0)
rails-assets-jquery (>= 1.4.2)
@@ -770,7 +770,7 @@ DEPENDENCIES
rack-ssl (= 1.4.1)
rails (= 4.2.1)
rails-assets-diaspora_jsxc (~> 0.1.1)!
- rails-assets-jasmine-ajax (= 3.0.0)!
+ rails-assets-jasmine-ajax (= 3.1.0)!
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
rails-assets-jquery (= 1.11.1)!
rails-assets-jquery-idletimer (= 1.0.1)!
--
GitLab