diff options
| author | Azul <azul@leap.se> | 2012-11-04 17:57:03 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-04 17:57:03 +0100 |
| commit | c0f92bf9f481463dcaef6f4b30343130a8910a00 (patch) | |
| tree | 3ba89c6f38d19a7b96a0ef599b7cb6364ba5821f /app/controllers/application_controller.rb | |
| parent | b92d418ebec6486a9e728c57f38f82d4c3343341 (diff) | |
| parent | 19008253d01fd6d7a864e98a7ae5dc216070aee1 (diff) | |
Merge branch 'develop' into feature-warden-srp
Conflicts:
Gemfile.lock
users/app/controllers/application_controller.rb
users/leap_web_users.gemspec
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 7 |
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 |