aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorAlban Peignier2012-04-13 18:08:36 +0200
committerAlban Peignier2012-04-13 18:08:36 +0200
commit35e03fb3188610308d9127a9bab878c2234b22db (patch)
tree6aa01d3368274ead75ef16fd3813a93ec2e4229f /app/controllers/application_controller.rb
parent466425c947f1eae5dc25e84095e22558bbdc7972 (diff)
parentfbedb1806047513455f0c54c71e841e3c6a1d623 (diff)
downloadchouette-core-35e03fb3188610308d9127a9bab878c2234b22db.tar.bz2
Merge branch 'devise-7'
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7050568de..ae953a25a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,4 +1,4 @@
class ApplicationController < ActionController::Base
protect_from_forgery
-
+ before_filter :authenticate_user!
end