From b9dd0830ea5e8924f4063511521ffc1e37c43368 Mon Sep 17 00:00:00 2001
From: Geoff Longman <geoff@healthwave.co>
Date: Tue, 1 Aug 2017 06:47:02 -0400
Subject: [PATCH] bump spree_core to rails 4.2

---
 common_spree_dependencies.rb | 2 +-
 core/spree_core.gemspec      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common_spree_dependencies.rb b/common_spree_dependencies.rb
index 9da98cedd5d..869f8b8005a 100644
--- a/common_spree_dependencies.rb
+++ b/common_spree_dependencies.rb
@@ -7,7 +7,7 @@
   gem 'mysql2'
   gem 'pg'
   gem 'sqlite3'
-  gem 'rails', '~> 4.1'
+  gem 'rails', '~> 4.2'
 end
 
 platforms :jruby do
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
index db9611c6d3f..80522a59e6a 100644
--- a/core/spree_core.gemspec
+++ b/core/spree_core.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'monetize', '~> 1.1'
   s.add_dependency 'paperclip', '~> 4.3.1'
   s.add_dependency 'paranoia', '~> 2.0'
-  s.add_dependency 'rails', '~> 4.1.12'
+  s.add_dependency 'rails', '~> 4.2.9'
   s.add_dependency 'ransack', '~> 1.4.1'
   s.add_dependency 'state_machine', '1.2.0'
   s.add_dependency 'stringex', '~> 1.5.1'