summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-10-17 16:02:33 +0200
committerAzul <azul@leap.se>2012-10-17 16:02:33 +0200
commitd9a510fa2126c29f0af58c6bbeff35802777eee6 (patch)
tree9e784338d95fc5d3e0b29f8083a07de43f2a1f53 /app/controllers
parent0c79df9874c59fbaa5c845e07d8fa1b4bbc23b9c (diff)
parentdc0584f7d993ef7c75fbdd9d341ebb3337f3448d (diff)
Merge branch 'feature-authentication_system' into develop
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e8065d9..693bd86 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,10 @@
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
end