diff options
| author | jessib <jessib@riseup.net> | 2012-10-31 10:43:33 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-10-31 10:43:33 -0700 |
| commit | fc625a54eb5c54cecb5331811ff482df12b7c059 (patch) | |
| tree | 6ffae8ccde3662360416fc2ce6e15ccfc2cf29a4 /app | |
| parent | 2de76b40a926985fce186c8ba18450d310ed4fa3 (diff) | |
| parent | 4b7333eec8eaf0c01227ade9d77a21f7a879ff0b (diff) | |
Merge branch 'develop' of ssh://leap.se/leap_web into develop
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 7 | ||||
| -rw-r--r-- | app/views/home/index.html.haml | 2 |
2 files changed, 2 insertions, 7 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 diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 34fb201..9e68674 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -8,4 +8,4 @@ Try to create a %p See all -= link_to "tickets", tickets_path
\ No newline at end of file += link_to "tickets", tickets_path |