Skip to content

Commit 36d3ca1

Browse files
Merge pull request #293 from aleksei-burlakov/dev-enable-sprockets-4.2
Dev: make sprockets-4.2 compatible
2 parents 1d325f4 + 307b96b commit 36d3ca1

File tree

2 files changed

+10
-24
lines changed

2 files changed

+10
-24
lines changed

hawk/app/assets/config/manifest.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
//= link_tree ../images
2-
//= link_directory ../stylesheets .css
3-
//= link_tree ../../assets/javascripts .js
4-
//= link_tree ../../../vendor/assets/javascripts .js
2+
//= link_directory ../javascripts .js
3+
//= link_directory ../javascripts/locale .js

hawk/config/initializers/assets.rb

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,13 @@
44
Rails.application.config.tap do |config|
55
config.assets.version = "1.0"
66

7-
config.assets.precompile = [
8-
/locale\/.+\.(css|js)$/,
9-
/gettext\.(css|js)$/,
10-
/application\.(css|js)$/,
11-
/authentication\.(css|js)$/,
12-
/dashboard.(css|js)$/,
13-
/ie\.(css|js)$/,
14-
/vendor\.(css|js)$/,
15-
/\.(jpg|png|gif|svg|ico|eot|woff|woff2|ttf)$/
7+
config.assets.precompile = %w( manifest.js )
8+
config.assets.precompile << [
9+
"gettext.css", "gettext.js",
10+
"application.css","application.js",
11+
"authentication.css", "authentication.js",
12+
"dashboard.css", "dashboard.js",
13+
"ie.css", "ie.js",
14+
"vendor.css", "vendor.js"
1615
]
17-
18-
config.assets.paths << config.root.join(
19-
"vendor",
20-
"assets",
21-
"fonts"
22-
)
23-
24-
config.assets.paths << config.root.join(
25-
"vendor",
26-
"assets",
27-
"images"
28-
)
2916
end

0 commit comments

Comments
 (0)