[Git][noosfero/noosfero][rails4] rails4: fix asset pipeline

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch rails4 at Noosfero / noosfero


Commits:
f9a04729 by Braulio Bhavamitra at 2015-11-07T12:40:16Z
rails4: fix asset pipeline

- - - - -


2 changed files:

- config/application.rb
- config/environments/production.rb


Changes:

=====================================
config/application.rb
=====================================
--- a/config/application.rb
+++ b/config/application.rb
@@ -75,13 +75,7 @@ module Noosfero
     # parameters by using an attr_accessible or attr_protected declaration.
     config.active_record.whitelist_attributes = true
 
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # don't let rails prepend app/assets to config.assets.paths
-    # as we are doing it
-    config.paths['app/assets'] = ''
-
+    # Asset pipeline
     config.assets.paths =
       Dir.glob("app/assets/plugins/*/{,stylesheets,javascripts}") +
       Dir.glob("app/assets/{,stylesheets,javascripts}") +


=====================================
config/environments/production.rb
=====================================
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -11,8 +11,8 @@ Noosfero::Application.configure do
   # Enable Rails's static asset server (Apache or nginx should do this)
   config.serve_static_assets = true
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts (sass-rails enable compression of CSS by default)
+  config.assets.js_compressor = :uglifier
 
   # Generate digests for assets URLs
   config.assets.digest = true



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/f9a04729957569d154147ec505e0bc36a79000a3
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151107/1ff6d342/attachment.html>