Allow simple ivar ||= form. Update accordingly

4 files changed, 10 insertions, 12 deletions

diff --git a/lib/api/api_guard.rb b/lib/api/api_guard.rb
index 05f55097a80..9933439c43b 100644
--- a/lib/api/api_guard.rb
+++ b/lib/api/api_guard.rb
@@ -2,7 +2,6 @@
 
 require 'rack/oauth2'
 
-# rubocop:disable Cop/ModuleWithInstanceVariables
 module API
   module APIGuard
     extend ActiveSupport::Concern
@@ -43,6 +42,8 @@ module API
 
     # Helper Methods for Grape Endpoint
     module HelperMethods
+      attr_reader :current_user
+
       # Invokes the doorkeeper guard.
       #
       # If token is presented and valid, then it sets @current_user.
@@ -61,6 +62,7 @@ module API
       #   scopes: (optional) scopes required for this guard.
       #           Defaults to empty array.
       #
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def doorkeeper_guard(scopes: [])
         access_token = find_access_token
         return nil unless access_token
@@ -88,10 +90,6 @@ module API
         find_user_by_authentication_token(token_string) || find_user_by_personal_access_token(token_string, scopes)
       end
 
-      def current_user
-        @current_user
-      end
-
       private
 
       def find_user_by_authentication_token(token_string)
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 49e659d3d27..abbe2e9ba3e 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -1,4 +1,3 @@
-# rubocop:disable Cop/ModuleWithInstanceVariables
 module API
   module Helpers
     include Gitlab::Utils
@@ -33,6 +32,7 @@ module API
       end
     end
 
+    # rubocop:disable Cop/ModuleWithInstanceVariables
     def current_user
       return @current_user if defined?(@current_user)
 
@@ -396,6 +396,7 @@ module API
       warden.try(:authenticate) if verified_request?
     end
 
+    # rubocop:disable Cop/ModuleWithInstanceVariables
     def initial_current_user
       return @initial_current_user if defined?(@initial_current_user)
       Gitlab::Auth::UniqueIpsLimiter.limit_user! do
@@ -411,6 +412,7 @@ module API
       end
     end
 
+    # rubocop:disable Cop/ModuleWithInstanceVariables
     def sudo!
       return unless sudo_identifier
       return unless initial_current_user
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb
index a187517a66a..6bb85dd2619 100644
--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
@@ -1,4 +1,3 @@
-# rubocop:disable Cop/ModuleWithInstanceVariables
 module API
   module Helpers
     module InternalHelpers
@@ -7,20 +6,20 @@ module API
         'git-upload-pack' => :ssh_upload_pack
       }.freeze
 
+      attr_reader :redirected_path
+
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def wiki?
         set_project unless defined?(@wiki)
         @wiki
       end
 
+      # rubocop:disable Cop/ModuleWithInstanceVariables
       def project
         set_project unless defined?(@project)
         @project
       end
 
-      def redirected_path
-        @redirected_path
-      end
-
       def ssh_authentication_abilities
         [
           :read_project,
diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb
index 1b21594487d..282af32ca94 100644
--- a/lib/api/helpers/runner.rb
+++ b/lib/api/helpers/runner.rb
@@ -21,7 +21,6 @@ module API
         forbidden! unless current_runner
       end
 
-      # rubocop:disable Cop/ModuleWithInstanceVariables
       def current_runner
         @runner ||= ::Ci::Runner.find_by_token(params[:token].to_s)
       end