Skip to content
Browse files

Resolve issues with Monarch breaking asset precompilation

  • Loading branch information...
1 parent 340cd1f commit 7dad06ec96b4c893717a26fddb7f1f5bd08073db @nathansobo committed Nov 13, 2012
Showing with 4 additions and 2 deletions.
  1. +3 −1 config/environments/production.rb
  2. +1 −1 vendor/assets/javascripts/monarch
View
4 config/environments/production.rb
@@ -47,7 +47,9 @@
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
# config.assets.precompile += %w( search.js )
-
+ # This is the new default in newer versions of Rails, but I don't want to upgrade right now
+ config.assets.precompile = [ Proc.new { |path, fn| fn =~ /app\/assets/ && !%w(.js .css).include?(File.extname(path)) },
+ /(?:\/|\\|\A)application\.(css|js)$/ ]
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
2 vendor/assets/javascripts/monarch
@@ -1 +1 @@
-Subproject commit 41986f0426449b8a30ea655f3dc782a632bd519b
+Subproject commit 23ad80b3735d86247c51cf5f5a972b293580f906

0 comments on commit 7dad06e

Please sign in to comment.
Something went wrong with that request. Please try again.