Depend on rails 4.1.0

solidusio · Apr 11, 2014 · 82fc8fd · 82fc8fd
1 parent 2fcae9c
commit 82fc8fd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/common_spree_dependencies.rb b/common_spree_dependencies.rb
@@ -30,6 +30,5 @@
  gem 'poltergeist', '1.5.0'
 end
 
-gem 'rails', github: 'rails/rails', branch: '4-1-0'
 gem 'polyamorous', github: 'activerecord-hackery/polyamorous'
 gem 'ransack', github: 'activerecord-hackery/ransack', branch: 'rails-4.1'
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
  s.add_dependency 'monetize'
  s.add_dependency 'paperclip', '~> 4.1.1'
  s.add_dependency 'paranoia', '~> 2.0'
- s.add_dependency 'rails', '~> 4.1.0.rc1'
+ s.add_dependency 'rails', '~> 4.1.0'
  s.add_dependency 'ransack', '~> 1.1.0'
  s.add_dependency 'state_machine', '1.2.0'
  s.add_dependency 'stringex', '~> 1.5.1'