From 69b4492148a2bc932dea33d508f09375a8c683dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 28 Dec 2015 05:38:04 +0100
Subject: [PATCH] bump js-routes
---
Gemfile | 2 +-
Gemfile.lock | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index 44c79c1202..431ec4cc22 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,7 +88,7 @@ gem "handlebars_assets", "0.22.0"
gem "jquery-rails", "4.0.5"
gem "jquery-ui-rails", "5.0.5"
gem "js_image_paths", "0.0.2"
-gem "js-routes", "1.1.2"
+gem "js-routes", "1.2.0"
source "https://rails-assets.org" do
gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails
diff --git a/Gemfile.lock b/Gemfile.lock
index bee208cf14..fb063d72e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,6 +114,7 @@ GEM
compass (~> 1.0.0)
sass-rails (< 5.1)
sprockets (< 2.13)
+ concurrent-ruby (1.0.0)
configurate (0.3.1)
connection_pool (2.2.0)
crack (0.4.3)
@@ -404,7 +405,7 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
- js-routes (1.1.2)
+ js-routes (1.2.0)
railties (>= 3.2)
sprockets-rails
js_image_paths (0.0.2)
@@ -818,7 +819,7 @@ DEPENDENCIES
jasmine-jquery-rails (= 2.0.3)
jquery-rails (= 4.0.5)
jquery-ui-rails (= 5.0.5)
- js-routes (= 1.1.2)
+ js-routes (= 1.2.0)
js_image_paths (= 0.0.2)
jshintrb (= 0.3.0)
json (= 1.8.3)
--
GitLab