Skip to content

Commit

Permalink
Peg sprockets to ~> 2.11.0 and sass to ~> 3.2.15 for Rails 4.x builds
Browse files Browse the repository at this point in the history
If we don't specify 2.11.0 we'll end up with sprockets 2.12.0 in the
main Gemfile.lock but since sass-rails gets generated (rails new) into
the test app it'll want sprockets 2.11.0 and we'll have a conflict

If we don't specify 3.2.15 we'll end up with sass 3.3.2 in the
main Gemfile.lock but since sass-rails gets generated (rails new) into
the test app it'll want sass 3.2.0 and we'll have a conflict
  • Loading branch information
jcoyne committed Mar 17, 2014
1 parent bca048b commit a62bbf3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions gemfiles/rails4.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ if File.exists?(file)
puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
instance_eval File.read(file)
end
gem 'sass', '~> 3.2.15'
gem 'sprockets', '~> 2.11.0'

gem 'rails', '4.1.0.rc1'
3 changes: 3 additions & 0 deletions gemfiles/rails4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ if File.exists?(file)
instance_eval File.read(file)
end

gem 'sass', '~> 3.2.15'
gem 'sprockets', '~> 2.11.0'

gem 'rails', '4.0.3'

0 comments on commit a62bbf3

Please sign in to comment.