summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-31 11:14:38 -0700
committerjessib <jessib@riseup.net>2012-10-31 11:14:38 -0700
commitfa6c453603d2754644f80efc6e8a0f6e792cc9bd (patch)
tree4ec755dc917fea9eba4c94d988a0aae25eca6790 /app/controllers
parenta2a8caf577415ef51c0f99da43f9b47bde226fc6 (diff)
parentfc625a54eb5c54cecb5331811ff482df12b7c059 (diff)
Merge branch 'develop' into feature-admin_users
Conflicts: users/app/controllers/application_controller.rb users/app/models/user.rb
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 693bd86..be7aa1f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,10 +1,5 @@
class ApplicationController < ActionController::Base
protect_from_forgery
- helper_method :current_user
-
- private
- def current_user
- @current_user ||= User.find(session[:user_id]) if session[:user_id]
- end
+ ActiveSupport.run_load_hooks(:application_controller, self)
end