Merge branch 'require-sass' into sprockets-3-beta-test

josh · josh · commit 94086b39963a · 2015-03-22T18:15:56.000-07:00
diff --git a/lib/sass/rails/helpers.rb b/lib/sass/rails/helpers.rb
@@ -1,3 +1,4 @@
+require 'sass'
 require 'sprockets/sass_functions'
 
 module Sprockets
diff --git a/lib/sass/rails/logger.rb b/lib/sass/rails/logger.rb
@@ -1,3 +1,4 @@
+require 'sass'
 require 'sass/logger'
 
 module Sass
diff --git a/lib/sass/rails/railtie.rb b/lib/sass/rails/railtie.rb
@@ -1,3 +1,4 @@
+require 'sass'
 require 'active_support/core_ext/class/attribute'
 require 'sprockets/railtie'
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+require 'sass'`
`1`	`2`	`require 'sprockets/sass_functions'`
`2`	`3`
`3`	`4`	`module Sprockets`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+require 'sass'`
`1`	`2`	`require 'active_support/core_ext/class/attribute'`
`2`	`3`	`require 'sprockets/railtie'`
`3`	`4`