From b0a5fb4ef892ec8913921c5767c1b0e807b17159 Mon Sep 17 00:00:00 2001 From: GitLab Housekeeping Bot Date: Mon, 28 Jul 2025 04:20:07 +0000 Subject: [PATCH] Fix 20 rubocop violations for Layout/EmptyLineAfterMagicComment Fixes the 20 violations for the rubocop rule `Layout/EmptyLineAfterMagicComment` that were previously excluded in `.rubocop_todo/layout/empty_line_after_magic_comment.yml`. The exclusions have now been removed. This change was generated by [gitlab-housekeeper](https://gitlab.com/gitlab-org/gitlab/-/tree/master/gems/gitlab-housekeeper) in [CI](https://gitlab.com/gitlab-org/quality/engineering-productivity/team/-/jobs/10826130671) using the `Gitlab::Housekeeper::Keeps::RubocopFixer` keep. To provide feedback on your experience with `gitlab-housekeeper` please create an issue with the label ~"GitLab Housekeeper" and consider pinging the author of this keep. Changelog: other --- .../layout/empty_line_after_magic_comment.yml | 20 ------------------- app/models/concerns/enums/ci/commit_status.rb | 1 + app/models/dependency_proxy.rb | 1 + app/models/draft_note.rb | 1 + app/models/ml.rb | 1 + app/models/namespace/traversal_hierarchy.rb | 1 + app/models/namespaces/traversal/linear.rb | 1 + app/models/packages.rb | 1 + app/models/packages/cleanup.rb | 1 + app/models/packages/conan.rb | 1 + app/models/packages/dependency_link.rb | 1 + app/models/packages/maven.rb | 1 + app/models/packages/maven/metadatum.rb | 1 + app/models/packages/npm.rb | 1 + app/models/packages/nuget.rb | 1 + app/models/packages/package.rb | 1 + app/models/packages/pypi.rb | 1 + app/models/packages/rpm.rb | 1 + app/models/packages/rpm/repository_file.rb | 1 + app/models/packages/rubygems.rb | 1 + app/models/packages/tag.rb | 1 + 21 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.rubocop_todo/layout/empty_line_after_magic_comment.yml b/.rubocop_todo/layout/empty_line_after_magic_comment.yml index 73e4f63f67b7ae..f2d0184fe2ec3a 100644 --- a/.rubocop_todo/layout/empty_line_after_magic_comment.yml +++ b/.rubocop_todo/layout/empty_line_after_magic_comment.yml @@ -2,26 +2,6 @@ # Cop supports --autocorrect. Layout/EmptyLineAfterMagicComment: Exclude: - - 'app/models/concerns/enums/ci/commit_status.rb' - - 'app/models/dependency_proxy.rb' - - 'app/models/draft_note.rb' - - 'app/models/ml.rb' - - 'app/models/namespace/traversal_hierarchy.rb' - - 'app/models/namespaces/traversal/linear.rb' - - 'app/models/packages.rb' - - 'app/models/packages/cleanup.rb' - - 'app/models/packages/conan.rb' - - 'app/models/packages/dependency_link.rb' - - 'app/models/packages/maven.rb' - - 'app/models/packages/maven/metadatum.rb' - - 'app/models/packages/npm.rb' - - 'app/models/packages/nuget.rb' - - 'app/models/packages/package.rb' - - 'app/models/packages/pypi.rb' - - 'app/models/packages/rpm.rb' - - 'app/models/packages/rpm/repository_file.rb' - - 'app/models/packages/rubygems.rb' - - 'app/models/packages/tag.rb' - 'app/models/users/user_follow_user.rb' - 'app/policies/container_registry/tag_policy.rb' - 'app/policies/customer_relations/contact_policy.rb' diff --git a/app/models/concerns/enums/ci/commit_status.rb b/app/models/concerns/enums/ci/commit_status.rb index 45acd5595521c5..225d344fac31f7 100644 --- a/app/models/concerns/enums/ci/commit_status.rb +++ b/app/models/concerns/enums/ci/commit_status.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Enums module Ci module CommitStatus diff --git a/app/models/dependency_proxy.rb b/app/models/dependency_proxy.rb index 0ed17921aaa9f7..b6af28289173d3 100644 --- a/app/models/dependency_proxy.rb +++ b/app/models/dependency_proxy.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module DependencyProxy URL_SUFFIX = '/dependency_proxy/containers' DISTRIBUTION_API_VERSION = 'registry/2.0' diff --git a/app/models/draft_note.rb b/app/models/draft_note.rb index 1c5aeff131def7..8d76808c802d34 100644 --- a/app/models/draft_note.rb +++ b/app/models/draft_note.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class DraftNote < ApplicationRecord include DiffPositionableNote include Gitlab::Utils::StrongMemoize diff --git a/app/models/ml.rb b/app/models/ml.rb index e426ce851eb198..6d49027b0e12be 100644 --- a/app/models/ml.rb +++ b/app/models/ml.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Ml def self.table_name_prefix 'ml_' diff --git a/app/models/namespace/traversal_hierarchy.rb b/app/models/namespace/traversal_hierarchy.rb index e883e265fa3951..f0fa6c49a96045 100644 --- a/app/models/namespace/traversal_hierarchy.rb +++ b/app/models/namespace/traversal_hierarchy.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # A Namespace::TraversalHierarchy is the collection of namespaces that descend # from a root Namespace as defined by the Namespace#traversal_ids attributes. diff --git a/app/models/namespaces/traversal/linear.rb b/app/models/namespaces/traversal/linear.rb index 05edb14a4cdc91..320457cac5ebb2 100644 --- a/app/models/namespaces/traversal/linear.rb +++ b/app/models/namespaces/traversal/linear.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # Query a recursively defined namespace hierarchy using linear methods through # the traversal_ids attribute. diff --git a/app/models/packages.rb b/app/models/packages.rb index 87948617b8e717..0ff44abb0dfda9 100644 --- a/app/models/packages.rb +++ b/app/models/packages.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Packages DuplicatePackageError = Class.new(StandardError) PackageProtectedError = Class.new(StandardError) diff --git a/app/models/packages/cleanup.rb b/app/models/packages/cleanup.rb index 16bba4f445d9e0..2febc40ddb9856 100644 --- a/app/models/packages/cleanup.rb +++ b/app/models/packages/cleanup.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Packages module Cleanup def self.table_name_prefix diff --git a/app/models/packages/conan.rb b/app/models/packages/conan.rb index 01007c3fa78672..ea106d18200914 100644 --- a/app/models/packages/conan.rb +++ b/app/models/packages/conan.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Packages module Conan def self.table_name_prefix diff --git a/app/models/packages/dependency_link.rb b/app/models/packages/dependency_link.rb index 6fbc06eab70177..1b6fec67611aeb 100644 --- a/app/models/packages/dependency_link.rb +++ b/app/models/packages/dependency_link.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class Packages::DependencyLink < ApplicationRecord include EachBatch diff --git a/app/models/packages/maven.rb b/app/models/packages/maven.rb index 5c1581ce0b775d..4af4f0fca42863 100644 --- a/app/models/packages/maven.rb +++ b/app/models/packages/maven.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Packages module Maven def self.table_name_prefix diff --git a/app/models/packages/maven/metadatum.rb b/app/models/packages/maven/metadatum.rb index fce831eee6388e..7e924ef467bce8 100644 --- a/app/models/packages/maven/metadatum.rb +++ b/app/models/packages/maven/metadatum.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class Packages::Maven::Metadatum < ApplicationRecord belongs_to :package, class_name: 'Packages::Maven::Package' diff --git a/app/models/packages/npm.rb b/app/models/packages/npm.rb index 9221187d92ac4c..30513dcf4e5619 100644 --- a/app/models/packages/npm.rb +++ b/app/models/packages/npm.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Packages module Npm # from "@scope/package-name" return "scope" or nil diff --git a/app/models/packages/nuget.rb b/app/models/packages/nuget.rb index 9a9e5b6605a7b0..01f2b9ffe5da2d 100644 --- a/app/models/packages/nuget.rb +++ b/app/models/packages/nuget.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Packages module Nuget TEMPORARY_PACKAGE_NAME = 'NuGet.Temporary.Package' diff --git a/app/models/packages/package.rb b/app/models/packages/package.rb index b21929f7ae53a7..00b065376134e0 100644 --- a/app/models/packages/package.rb +++ b/app/models/packages/package.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class Packages::Package < ApplicationRecord include EachBatch include Sortable diff --git a/app/models/packages/pypi.rb b/app/models/packages/pypi.rb index fc8a55caa31250..f19597cd7782cf 100644 --- a/app/models/packages/pypi.rb +++ b/app/models/packages/pypi.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Packages module Pypi def self.table_name_prefix diff --git a/app/models/packages/rpm.rb b/app/models/packages/rpm.rb index fc66e7ec5c8fd5..f575a990831369 100644 --- a/app/models/packages/rpm.rb +++ b/app/models/packages/rpm.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Packages module Rpm def self.table_name_prefix diff --git a/app/models/packages/rpm/repository_file.rb b/app/models/packages/rpm/repository_file.rb index 5a8036e1f46703..cfa7d4dc5ac872 100644 --- a/app/models/packages/rpm/repository_file.rb +++ b/app/models/packages/rpm/repository_file.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Packages module Rpm class RepositoryFile < ApplicationRecord diff --git a/app/models/packages/rubygems.rb b/app/models/packages/rubygems.rb index 1aa6b16f47eeda..a88f491a9091f6 100644 --- a/app/models/packages/rubygems.rb +++ b/app/models/packages/rubygems.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + module Packages module Rubygems TEMPORARY_PACKAGE_NAME = 'Gem.Temporary.Package' diff --git a/app/models/packages/tag.rb b/app/models/packages/tag.rb index 0c1325f6cce86f..3275aae85451da 100644 --- a/app/models/packages/tag.rb +++ b/app/models/packages/tag.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + class Packages::Tag < ApplicationRecord belongs_to :package, inverse_of: :tags belongs_to :project -- GitLab