summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-07-09 11:53:58 -0700
committerjessib <jessib@leap.se>2013-07-09 11:53:58 -0700
commit09b7f01cac6df1ae11f4129b20b781b78a3706ac (patch)
tree3921eaa5edd03d80e6b402c5c2f88dda6338ab3a /config/application.rb
parent9979b50848ce27730f880159512933e50d5ae0e4 (diff)
parent3113f8b814417a896ad5340fda88927733f8ab22 (diff)
Merge branch 'master' into feature/authentication_generic_error
Conflicts: app/views/layouts/_messages.html.haml app/views/layouts/application.html.haml users/app/assets/javascripts/users.js.coffee
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 957bb0d..5e52c7b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -59,11 +59,18 @@ module LeapWeb
# parameters by using an attr_accessible or attr_protected declaration.
# config.active_record.whitelist_attributes = true
+ ##
+ ## ASSETS
+ ##
+
# Enable the asset pipeline
config.assets.enabled = true
config.assets.initialize_on_precompile = false
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
+
+ # Set to false in order to see asset requests in the log
+ config.quiet_assets = true
end
end