Add latest changes from gitlab-org/gitlab@master

8 files changed, 9 insertions, 28 deletions

diff --git a/lib/bitbucket/representation/repo.rb b/lib/bitbucket/representation/repo.rb
index fa4780dd8de..8d5b15e299a 100644
--- a/lib/bitbucket/representation/repo.rb
+++ b/lib/bitbucket/representation/repo.rb
@@ -3,10 +3,6 @@
 module Bitbucket
   module Representation
     class Repo < Representation::Base
-      def initialize(raw)
-        super(raw)
-      end
-
       def owner_and_slug
         @owner_and_slug ||= full_name.split('/', 2)
       end
diff --git a/lib/bitbucket_server/representation/repo.rb b/lib/bitbucket_server/representation/repo.rb
index 4cd5b75bbed..a3c5f387941 100644
--- a/lib/bitbucket_server/representation/repo.rb
+++ b/lib/bitbucket_server/representation/repo.rb
@@ -3,10 +3,6 @@
 module BitbucketServer
   module Representation
     class Repo < Representation::Base
-      def initialize(raw)
-        super(raw)
-      end
-
       def project_key
         raw.dig('project', 'key')
       end
diff --git a/lib/gitlab/background_migration/.rubocop.yml b/lib/gitlab/background_migration/.rubocop.yml
index 50112a51675..116c84c3759 100644
--- a/lib/gitlab/background_migration/.rubocop.yml
+++ b/lib/gitlab/background_migration/.rubocop.yml
@@ -50,3 +50,12 @@ Style/FrozenStringLiteralComment:
   Enabled: true
   Details: >-
     This removes the need for calling "freeze", reducing noise in the code.
+
+Migration/BackgroundMigrationBaseClass:
+  Enabled: true
+  Exclude:
+    - 'batching_strategies/**/*.rb'
+    - 'job_coordinator.rb'
+    - 'base_job.rb'
+    - 'batched_migration_job.rb'
+    - 'logger.rb'
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/string.rb b/lib/gitlab/ci/pipeline/expression/lexeme/string.rb
index e90e764bcd9..798cea34db6 100644
--- a/lib/gitlab/ci/pipeline/expression/lexeme/string.rb
+++ b/lib/gitlab/ci/pipeline/expression/lexeme/string.rb
@@ -8,10 +8,6 @@ module Gitlab
           class String < Lexeme::Value
             PATTERN = /("(?<string>.*?)")|('(?<string>.*?)')/.freeze
 
-            def initialize(value)
-              super(value)
-            end
-
             def evaluate(variables = {})
               @value.to_s
             end
diff --git a/lib/gitlab/config/entry/validator.rb b/lib/gitlab/config/entry/validator.rb
index e5efd4a7b0a..297645a65c1 100644
--- a/lib/gitlab/config/entry/validator.rb
+++ b/lib/gitlab/config/entry/validator.rb
@@ -7,10 +7,6 @@ module Gitlab
         include ActiveModel::Validations
         include Entry::Validators
 
-        def initialize(entry)
-          super(entry)
-        end
-
         def messages
           errors.full_messages.map do |error|
             "#{location} #{error}".downcase
diff --git a/lib/gitlab/git/branch.rb b/lib/gitlab/git/branch.rb
index fbe52db9c0b..9637f8756b1 100644
--- a/lib/gitlab/git/branch.rb
+++ b/lib/gitlab/git/branch.rb
@@ -13,10 +13,6 @@ module Gitlab
         end
       end
 
-      def initialize(repository, name, target, target_commit)
-        super(repository, name, target, target_commit)
-      end
-
       def active?
         self.dereferenced_target.committed_date >= STALE_BRANCH_THRESHOLD.ago
       end
diff --git a/lib/gitlab/reactive_cache_set_cache.rb b/lib/gitlab/reactive_cache_set_cache.rb
index e4a92ed5122..7ccbeadfd8a 100644
--- a/lib/gitlab/reactive_cache_set_cache.rb
+++ b/lib/gitlab/reactive_cache_set_cache.rb
@@ -10,10 +10,6 @@ module Gitlab
       @expires_in = expires_in
     end
 
-    def cache_key(key)
-      super(key)
-    end
-
     def clear_cache!(key)
       with do |redis|
         keys = read(key).map { |value| "#{cache_namespace}:#{value}" }
diff --git a/lib/gitlab/snippet_search_results.rb b/lib/gitlab/snippet_search_results.rb
index 581d6b738f3..b77f48d1a2c 100644
--- a/lib/gitlab/snippet_search_results.rb
+++ b/lib/gitlab/snippet_search_results.rb
@@ -4,10 +4,6 @@ module Gitlab
   class SnippetSearchResults < SearchResults
     include SnippetsHelper
 
-    def initialize(current_user, query)
-      super(current_user, query)
-    end
-
     def objects(scope, page: nil, per_page: DEFAULT_PER_PAGE, preload_method: nil)
       paginated_objects(snippet_titles, page, per_page)
     end