Allow simple ivar ||= form. Update accordingly

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/gitlab/ci/config/entry/configurable.rb b/lib/gitlab/ci/config/entry/configurable.rb
index e34f4c9e101..2c96e5f65d7 100644
--- a/lib/gitlab/ci/config/entry/configurable.rb
+++ b/lib/gitlab/ci/config/entry/configurable.rb
@@ -13,7 +13,6 @@ module Gitlab
         #   script: ...
         #   artifacts: ...
         #
-        # rubocop:disable Cop/ModuleWithInstanceVariables
         module Configurable
           extend ActiveSupport::Concern
 
@@ -25,6 +24,7 @@ module Gitlab
             end
           end
 
+          # rubocop:disable Cop/ModuleWithInstanceVariables
           def compose!(deps = nil)
             return unless valid?
 
diff --git a/lib/gitlab/ci/config/entry/validatable.rb b/lib/gitlab/ci/config/entry/validatable.rb
index 524d349c094..1850c652c09 100644
--- a/lib/gitlab/ci/config/entry/validatable.rb
+++ b/lib/gitlab/ci/config/entry/validatable.rb
@@ -1,4 +1,3 @@
-# rubocop:disable Cop/ModuleWithInstanceVariables
 module Gitlab
   module Ci
     class Config
@@ -13,6 +12,7 @@ module Gitlab
             end
           end
 
+          # rubocop:disable Cop/ModuleWithInstanceVariables
           def errors
             @validator.messages + descendants.flat_map(&:errors)
           end