diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-05-02 19:24:49 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-05-02 19:24:49 -0500 |
| commit | 2fbbd08616c25dc2931eca914349dd2161766f69 (patch) | |
| tree | a2ecf98e9ffed527afd68c0e7d5cdbd3592cb556 | |
| parent | b359f9fe7cc3f664e145fae7b0d5b5c309587ef8 (diff) | |
| download | rails-2fbbd08616c25dc2931eca914349dd2161766f69.tar.gz rails-2fbbd08616c25dc2931eca914349dd2161766f69.tar.bz2 rails-2fbbd08616c25dc2931eca914349dd2161766f69.zip | |
Use require_self from latest Sprockets
| -rw-r--r-- | actionpack/actionpack.gemspec | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index a2570587ce..4af21366e3 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| 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 ccfff11a5d..f4b082ccc0 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 |