From 95ba640e1be18b7081b9dc8c528a23287a1e6673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Sat, 28 Feb 2015 02:06:36 +0100
Subject: [PATCH] bump handlebars_assets
---
Gemfile | 2 +-
Gemfile.lock | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Gemfile b/Gemfile
index 784aba0898..3df2e8f314 100644
--- a/Gemfile
+++ b/Gemfile
@@ -85,7 +85,7 @@ gem 'entypo-rails', '2.2.2'
# JavaScript
gem 'backbone-on-rails', '1.1.2'
-gem 'handlebars_assets', '0.18.0'
+gem 'handlebars_assets', '0.20.1'
gem 'jquery-rails', '3.1.2'
gem 'rails-assets-jquery', '1.11.1' # Should be kept in sync with jquery-rails
gem 'js_image_paths', '0.0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index b0fc13549a..f835062975 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -320,11 +320,11 @@ GEM
rspec (>= 2.99.0, < 4.0)
haml (4.0.6)
tilt
- handlebars_assets (0.18)
- execjs (>= 1.2.9)
- multi_json
- sprockets (>= 2.0.3)
- tilt
+ handlebars_assets (0.20.1)
+ execjs (~> 2.0)
+ multi_json (~> 1.0)
+ sprockets (~> 2.0)
+ tilt (~> 1.2)
hashie (3.3.1)
hike (1.2.3)
hiredis (0.5.2)
@@ -397,6 +397,7 @@ GEM
multi_test (0.1.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
+ mysql2 (0.3.18)
nenv (0.2.0)
nested_form (0.3.2)
net-scp (1.2.1)
@@ -438,7 +439,6 @@ GEM
faraday (~> 0.9.0)
nokogiri (~> 1.6)
orm_adapter (0.5.0)
- pg (0.18.1)
phantomjs (1.9.8.0)
pry (0.10.1)
coderay (~> 1.1.0)
@@ -722,7 +722,7 @@ DEPENDENCIES
guard-cucumber (= 1.5.3)
guard-rspec (= 4.5.0)
haml (= 4.0.6)
- handlebars_assets (= 0.18.0)
+ handlebars_assets (= 0.20.1)
http_accept_language (= 2.0.5)
i18n-inflector-rails (= 1.0.7)
jasmine (= 2.2.0)
@@ -737,6 +737,7 @@ DEPENDENCIES
mini_magick (= 4.1.0)
minitest
mobile-fu (= 1.3.1)
+ mysql2 (= 0.3.18)
nokogiri (= 1.6.6.2)
omniauth (= 1.2.2)
omniauth-facebook (= 1.6.0)
@@ -744,7 +745,6 @@ DEPENDENCIES
omniauth-twitter (= 1.0.1)
omniauth-wordpress (= 0.2.1)
open_graph_reader (= 0.4.0)
- pg (= 0.18.1)
pry
pry-byebug
pry-debundle
--
GitLab