diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index a2570587ceec79bda164fa850042da7ad85490b6..4af21366e3d9da997afeef25022b936806093f91 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -25,7 +25,7 @@ s.add_dependency('rack', '~> 1.2.1') s.add_dependency('rack-test', '~> 0.5.7') s.add_dependency('rack-mount', '~> 0.7.2') - s.add_dependency('sprockets', '~> 2.0.0.beta.1') + s.add_dependency('sprockets', '~> 2.0.0.beta.2') s.add_dependency('tzinfo', '~> 0.3.23') s.add_dependency('erubis', '~> 2.7.0') end diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css b/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css index ccfff11a5d0f4c6e05db8289be29860d3975944c..f4b082ccc0efe147023fb0216244fb1c5bc8cd33 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css +++ b/railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css @@ -1,4 +1,5 @@ /* * FIXME: Introduce SCSS & Sprockets + *= require_self *= require_tree . */ \ No newline at end of file