From 511d22361256569b2e22ab621876adee9107ba69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Mon, 11 Jul 2016 12:53:09 +0200
Subject: [PATCH] updates dependencies coffee-rails, foundation_rails_helper

---
 Gemfile      |  2 +-
 Gemfile.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9c84c0f11..e23636192 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem 'sass-rails', '~> 5.0', '>= 5.0.4'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.1.0'
+gem 'coffee-rails', '~> 4.2.1'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 39a57aee3..635db8a43 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -101,9 +101,9 @@ GEM
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    coffee-rails (4.1.1)
+    coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
+      railties (>= 4.0.0, < 5.2.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -159,11 +159,11 @@ GEM
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
       sprockets-es6 (>= 0.9.0)
-    foundation_rails_helper (1.1.0)
-      actionpack (~> 4.1)
-      activemodel (~> 4.1)
-      activesupport (~> 4.1)
-      railties (~> 4.1)
+    foundation_rails_helper (1.2.1)
+      actionpack (>= 4.1)
+      activemodel (>= 4.1)
+      activesupport (>= 4.1)
+      railties (>= 4.1)
       tzinfo (~> 1.2, >= 1.2.2)
     fuubar (2.0.0)
       rspec (~> 3.0)
@@ -447,7 +447,7 @@ DEPENDENCIES
   capistrano3-delayed-job (~> 1.0)
   capybara
   ckeditor (~> 4.1.5)
-  coffee-rails (~> 4.1.0)
+  coffee-rails (~> 4.2.1)
   coveralls
   daemons
   dalli