From: Andy Allan <git@gravitystorm.co.uk>
Date: Thu, 27 Jul 2017 09:31:31 +0000 (+0100)
Subject: Convert @user to current_user
X-Git-Tag: live~3306^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/09ba878519c73d517fa88fc1c2cad1d1924fdf84?hp=c819bec8b7b81fb2766a67247440375e4a837d10

Convert @user to current_user
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 049f6e02e..a367a1b0a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -49,7 +49,7 @@ class ApplicationController < ActionController::Base
   end
 
   def require_oauth
-    @oauth = @user.access_token(OAUTH_KEY) if current_user && defined? OAUTH_KEY
+    @oauth = current_user.access_token(OAUTH_KEY) if current_user && defined? OAUTH_KEY
   end
 
   ##