Merge branch 'master' into feature/disable_account

Conflicts:
	users/app/controllers/users_controller.rb
	users/app/helpers/users_helper.rb
	users/app/views/users/edit.html.haml
	users/app/views/users/show.html.haml
	users/config/locales/en.yml

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