1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

run against edge sass to eliminate circular require warnings

This commit is contained in:
Aaron Patterson 2015-09-30 07:42:31 -07:00
parent 591a0bb87f
commit ff30db1372
3 changed files with 11 additions and 7 deletions

View file

@ -37,7 +37,9 @@ gem 'bcrypt', '~> 3.1.10', require: false
# This needs to be with require false to avoid
# it being automatically loaded by sprockets
gem 'uglifier', '>= 1.3.0', require: false
gem 'sass', '>= 3.3', require: false
# Track stable branch of sass because it doesn't have circular require warnings
gem 'sass', github: 'sass/sass', branch: 'stable', require: false
group :doc do
gem 'sdoc', '~> 0.4.0'

View file

@ -103,6 +103,13 @@ GIT
specs:
concurrent-ruby (1.0.0.pre3)
GIT
remote: git://github.com/sass/sass.git
revision: 4ef8e3167985ace91b2105916756bd93c5d7bba6
branch: stable
specs:
sass (3.4.18)
PATH
remote: .
specs:
@ -256,7 +263,6 @@ GEM
resque (~> 1.25)
rufus-scheduler (~> 3.0)
rufus-scheduler (3.1.4)
sass (3.4.18)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
@ -342,7 +348,7 @@ DEPENDENCIES
redcarpet (~> 3.2.3)
resque
resque-scheduler
sass (>= 3.3)
sass!
sass-rails!
sdoc (~> 0.4.0)
sequel

View file

@ -335,9 +335,5 @@ Module.new do
File.open("#{app_template_path}/config/boot.rb", 'w') do |f|
f.puts "require '#{environment}'"
f.puts "require 'rails/all'"
# Preempt the Bundler.require in config/application.rb and silence warning
# spam from our gem dependencies (👋 hello Sass 😁)
f.puts "Kernel.silence_warnings { Bundler.require(*Rails.groups) }"
end
end unless defined?(RAILS_ISOLATED_ENGINE)