Merge branch 'master' of github.com:blindsidenetworks/greenlight

2016-10-18 10:03:50 -04:00
parent f725b7f1bc 352abe78af
commit e9caa740aa
17 changed files with 148 additions and 17 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -4,4 +4,9 @@ require 'digest/sha1'
 class ApplicationController < ActionController::Base
  protect_from_forgery with: :exception
  include ApplicationHelper
+
+  def current_user
+    @current_user ||= User.find_by(id: session[:user_id])
+  end
+  helper_method :current_user
 end