Skip to content

Commit 70f8fb4

Browse files
committed
Drop toplevel app/assets load path.
Bump version to 3.0.0.beta3 `app/assets` was added to give `manifest.js` a place to live, but it suggests that `require 'stylesheets/foo.css'` might be the right way to refer to `require 'foo.css'`. We resolve the overlap and clarify that `manifest.js` is config by moving it from `app/assets/` to `app/assets/config/`. Put it up on a pedestal: rails/rails#21794 This reverts #232 and commit 39ecb27, reversing changes made to 3a44d47.
1 parent 54e6cf2 commit 70f8fb4

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

lib/sprockets/rails/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Sprockets
22
module Rails
3-
VERSION = "3.0.0.beta2"
3+
VERSION = "3.0.0.beta3"
44
end
55
end

lib/sprockets/railtie.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ class Engine < Railtie
4747
initializer :append_assets_path, :group => :all do |app|
4848
app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
4949
app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
50-
app.config.assets.paths.unshift(*paths["app"].existent_directories.grep(/\/assets\z/))
5150
app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)
5251
end
5352
end

0 commit comments

Comments
 (0)