Rename cookie_id to banner_cookie

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 1653c98469030d4969a7f7c5aed3df650b2f0925..dfd87eb849ff2490b495e62669fa3cf8e7e8cb0c 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "4.2.5.1"
+gem "rails", "4.2.6"
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
@@ -91,9 +91,6 @@ gem "kgio"
 # Used to generate logstash friendly log files
 gem "logstasher"
 
-# Stay with sprockets-rails 2.x pending fix for konacha
-gem "sprockets-rails", "< 3"
-
 # Gems useful for development
 group :development do
   gem "vendorer"