From 398235ee6f0ed23b4e95ffa7228025d87237600c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bolvin?= Date: Mon, 21 Aug 2017 21:22:21 +0200 Subject: [PATCH] use asset manifest instead of entries in config.assets.precompile closes #7565 --- app/assets/config/manifest.js | 12 ++++++++++++ config/application.rb | 16 ++-------------- 2 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 app/assets/config/manifest.js diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..2347fce18 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,12 @@ +//= link contact-list.js +//= link jquery3.js +//= link jquery_ujs.js +//= link main.js +//= link jsxc.js +//= link bookmarklet.js +//= link mobile/bookmarklet.js +//= link mobile/mobile.js +//= link templates.js +//= link error_pages.css +//= link admin.css +//= link rtl.css diff --git a/config/application.rb b/config/application.rb index b3de93acb..fc7d90232 100644 --- a/config/application.rb +++ b/config/application.rb @@ -72,22 +72,10 @@ module Diaspora # Precompile additional assets. # (application.js, application.css, and all non-JS/CSS in the app/assets are already added) - config.assets.precompile += %w[ - contact-list.js - jquery3.js - jquery_ujs.js - main.js - jsxc.js - bookmarklet.js - mobile/bookmarklet.js - mobile/mobile.js - templates.js - - error_pages.css - admin.css - rtl.css + config.assets.precompile = %w[ color_themes/*/desktop.css color_themes/*/mobile.css + manifest.js ] # See lib/tasks/assets.rake: non_digest_assets