summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-07-02 13:29:50 +0300
committerValery Sizov <vsv2711@gmail.com>2015-07-02 13:29:50 +0300
commit7015ef1b60895ffa2a46b4a41f8f02018f74614c (patch)
tree401e3adc848ab6913e1f70e5f15a76d1133d86e9 /app/controllers/application_controller.rb
parent52e0d4754f70dddbad19b59cda9483152abf0617 (diff)
downloadgitlab-ci-oauth_everywhere.tar.gz
Get rid of private message usageoauth_everywhere
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9852736..8700317 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -12,6 +12,12 @@ class ApplicationController < ActionController::Base
def current_user
@current_user ||= session[:current_user]
+
+ # Backward compatibility. Until 7.13 user session doesn't contain access_token
+ # Users with old session should be logged out
+ return nil if @current_user && @current_user.access_token.nil?
+
+ @current_user
end
def sign_in(user)