Merge branch 'master' of github.com:fetsite/fetsite

Conflicts: Gemfile.lock
2013-11-12 20:25:48 +01:00
parent 127d3e51f0 7b5c39616a
commit 658811903b
9 changed files with 17 additions and 263 deletions
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -15,7 +15,7 @@ Fetsite::Application.configure do
  config.assets.compress = true

  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
+  config.assets.compile = true

  # Generate digests for assets URLs
  config.assets.digest = true