From 8e1e9f6c70e626e51b158511fb9ef417f04e5397 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Mon, 24 Nov 2014 15:48:43 -0500 Subject: Fix sprockets-rails dependency dance - Remove sprockets-rails from generated Gemfile as rails has a hard-dependency on it - Also allow sprockets-rails >= 2.0.0 --- rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rails.gemspec') diff --git a/rails.gemspec b/rails.gemspec index 99685252e0..cc1b8cb1a6 100644 --- a/rails.gemspec +++ b/rails.gemspec @@ -28,5 +28,5 @@ Gem::Specification.new do |s| s.add_dependency 'railties', version s.add_dependency 'bundler', '>= 1.3.0', '< 2.0' - s.add_dependency 'sprockets-rails', '~> 3.0.0.beta1' + s.add_dependency 'sprockets-rails', '>= 2.0.0' end -- cgit v1.2.3 From 35a14cfd5d60edb74309c3bfaf8e37d60f93b786 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Sat, 29 Nov 2014 18:45:47 +0200 Subject: Bump ruby version to 2.1.0 in rails.gemspec too. --- rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rails.gemspec') diff --git a/rails.gemspec b/rails.gemspec index 9969748a09..be83304e2b 100644 --- a/rails.gemspec +++ b/rails.gemspec @@ -7,7 +7,7 @@ Gem::Specification.new do |s| s.summary = 'Full-stack web application framework.' s.description = 'Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.' - s.required_ruby_version = '>= 1.9.3' + s.required_ruby_version = '>= 2.1.0' s.required_rubygems_version = '>= 1.8.11' s.license = 'MIT' -- cgit v1.2.3