gitlab-dangerfiles 4.10.0 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc6047699d31bc320127f651d567ddf984b6189eeeb7646eb4f0d46b4185e9fd
-  data.tar.gz: 655da17704203a02f6f138b8493bb8cf2002c2121d1015a63da0677ebf23b48d
+  metadata.gz: 1c8243740c97ac8d208ff6439af1a7651dc5b9ddded13cb3979ea9cadbe6755e
+  data.tar.gz: bcfe0970b1dd0ab065d947c9cc9dac727366ccea22dcedf21d61bc9374885c23
 SHA512:
-  metadata.gz: 02613c71246a09f46d15e0117e3f304ae626618c5736ff9b02f5e15bfbeccaa4921cefa694c97548dc5af2f4611866b58eb29f9eb5e0305d7412461097980a2c
-  data.tar.gz: 6703f6fe3502ad2336c33a4296a67d3e7d77d0dd9e46db97f510f0bd4c17a729f1bb20afcbb4ab6a0d5b24da477e4e50378e76cb943b9fc474fbed29320e619b
+  metadata.gz: 91cea0b62fe4490a78abddd4b36bd361895f05b6a40ed6d656e9435905748247689fba0d4f29ab39921b1f32e1d5f62a87fa034b8ce71c311d69d5b70b2685c4
+  data.tar.gz: d5ea002f3a5a2db4d8b70dde8c8cbe4ef1eb95c18dfd20f36245efacc1f12fadaabe6f677a5256afaa9534b68a881ff3eb67ae7c4e60c753a4a2bf48f3b5cc13

data/.gitignore

@@ -12,3 +12,4 @@
 
 # rspec failure tracking
 .rspec_status
+.idea

data/.gitlab-ci.yml

@@ -28,7 +28,8 @@ default:
   needs: []
   before_script:
     - gem install bundler
-    - bundle install -j $(nproc) --path vendor
+    - bundle config set path 'vendor'
+    - bundle install -j $(nproc)
   parallel:
     matrix:
       - RUBY_VERSION: ['3.0', '3.1', '3.2']

data/.rubocop.yml

@@ -16,8 +16,17 @@ Rails:
 CodeReuse/ActiveRecord:
   Enabled: false
 
-Layout/LineLength:
-  Enabled: false
+RSpec/ContextWording:
+  Prefixes:
+    - 'when'
+    - 'with'
+    - 'without'
+    - 'for'
+    - 'and'
+    - 'on'
+    - 'in'
+    - 'as'
+    - 'if'
 
 RSpec/MultipleMemoizedHelpers:
   Max: 35

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2023-01-12 11:28:46 UTC using RuboCop version 1.36.0.
+# `rubocop --auto-gen-config --no-exclude-limit`
+# on 2025-09-22 19:54:32 UTC using RuboCop version 1.43.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,7 +11,7 @@ Fips/MD5:
   Exclude:
     - 'lib/danger/plugins/roulette.rb'
 
-# Offense count: 3
+# Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
 # Include: **/*.gemspec
@@ -21,27 +21,19 @@ Gemspec/OrderedDependencies:
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Include.
+# Configuration parameters: Severity, Include.
 # Include: **/*.gemspec
 Gemspec/RequireMFA:
   Exclude:
     - 'gitlab-dangerfiles.gemspec'
 
 # Offense count: 1
-# Configuration parameters: Include.
+# Configuration parameters: Severity, Include.
 # Include: **/*.gemspec
 Gemspec/RequiredRubyVersion:
   Exclude:
     - 'gitlab-dangerfiles.gemspec'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith, Severity.
-# SupportedStylesAlignWith: start_of_line, begin
-Layout/BeginEndAlignment:
-  Exclude:
-    - 'lib/danger/plugins/roulette.rb'
-
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 Layout/ElseAlignment:
@@ -60,14 +52,12 @@ Layout/EndAlignment:
     - 'lib/danger/plugins/internal/helper.rb'
     - 'lib/gitlab/dangerfiles/teammate.rb'
 
-# Offense count: 6
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
+# Configuration parameters: IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
 Layout/FirstArrayElementIndentation:
-  Exclude:
-    - 'spec/danger/plugins/roulette_spec.rb'
-    - 'spec/gitlab/dangerfiles_spec.rb'
+  EnforcedStyle: consistent
 
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
@@ -86,12 +76,6 @@ Layout/LineEndStringConcatenationIndentation:
   Exclude:
     - 'lib/gitlab/dangerfiles/commit_linter.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/RescueEnsureAlignment:
-  Exclude:
-    - 'lib/danger/plugins/roulette.rb'
-
 # Offense count: 11
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousOperatorPrecedence:
@@ -107,12 +91,6 @@ Lint/BinaryOperatorWithIdenticalOperands:
   Exclude:
     - 'spec/gitlab/dangerfiles/teammate_spec.rb'
 
-# Offense count: 2
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
-Lint/DuplicateBranch:
-  Exclude:
-    - 'lib/danger/plugins/roulette.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Lint/DuplicateRegexpCharacterClassElement:
@@ -148,28 +126,20 @@ Naming/FileName:
   Exclude:
     - 'lib/gitlab-dangerfiles.rb'
 
-# Offense count: 3
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: PreferredName.
 Naming/RescuedExceptionsVariableName:
   Exclude:
     - 'lib/danger/plugins/changelog.rb'
-    - 'lib/danger/plugins/roulette.rb'
 
-# Offense count: 2
-# Configuration parameters: MinSize.
-Performance/CollectionLiteralInLoop:
-  Exclude:
-    - 'spec/danger/plugins/roulette_spec.rb'
-
-# Offense count: 5
+# Offense count: 3
 Performance/MethodObjectAsBlock:
   Exclude:
-    - 'lib/danger/plugins/roulette.rb'
     - 'spec/spec_helper.rb'
 
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
+# Offense count: 14
+# This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/BeEq:
   Exclude:
     - 'spec/danger/plugins/changelog_spec.rb'
@@ -184,7 +154,7 @@ RSpec/BeNil:
   Exclude:
     - 'spec/gitlab/dangerfiles/version_spec.rb'
 
-# Offense count: 24
+# Offense count: 21
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -206,7 +176,7 @@ RSpec/EmptyLineAfterLetBlock:
   Exclude:
     - 'spec/danger/plugins/internal/helper_spec.rb'
 
-# Offense count: 7
+# Offense count: 8
 RSpec/ExpectInHook:
   Exclude:
     - 'spec/danger/plugins/internal/helper_spec.rb'
@@ -218,39 +188,28 @@ RSpec/HooksBeforeExamples:
     - 'spec/danger/plugins/changelog_spec.rb'
     - 'spec/danger/plugins/roulette_spec.rb'
 
-# Offense count: 22
+# Offense count: 20
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_line_only, single_statement_only, disallow
+# SupportedStyles: single_line_only, single_statement_only, disallow, require_implicit
 RSpec/ImplicitSubject:
   Exclude:
     - 'spec/danger/plugins/changelog_spec.rb'
     - 'spec/danger/plugins/internal/helper_spec.rb'
-    - 'spec/danger/plugins/roulette_spec.rb'
 
-# Offense count: 27
+# Offense count: 9
 # This cop supports safe autocorrection (--autocorrect).
 RSpec/LetBeforeExamples:
   Exclude:
     - 'spec/danger/plugins/internal/helper_spec.rb'
     - 'spec/danger/plugins/roulette_spec.rb'
 
-# Offense count: 51
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Strict, EnforcedStyle, AllowedExplicitMatchers.
-# SupportedStyles: inflected, explicit
-RSpec/PredicateMatcher:
-  Exclude:
-    - 'spec/danger/plugins/changelog_spec.rb'
-    - 'spec/danger/plugins/internal/helper_spec.rb'
-    - 'spec/gitlab/dangerfiles/teammate_spec.rb'
-
 # Offense count: 2
 RSpec/RepeatedExampleGroupDescription:
   Exclude:
     - 'spec/gitlab/dangerfiles/commit_linter_spec.rb'
 
-# Offense count: 33
+# Offense count: 37
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
@@ -276,12 +235,11 @@ Style/ExpandPathArguments:
   Exclude:
     - 'gitlab-dangerfiles.gemspec'
 
-# Offense count: 4
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedVars.
 Style/FetchEnvVar:
   Exclude:
-    - 'lib/danger/rules/commit_messages/Dangerfile'
     - 'lib/danger/rules/z_retry_link/Dangerfile'
     - 'lib/gitlab/dangerfiles/config.rb'
 
@@ -294,21 +252,32 @@ Style/FormatString:
     - 'lib/danger/rules/simple_roulette/Dangerfile'
     - 'lib/gitlab/dangerfiles/base_linter.rb'
 
-# Offense count: 16
+# Offense count: 17
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
-  Enabled: false
-
-# Offense count: 2
-# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
-Style/GuardClause:
   Exclude:
-    - 'lib/danger/rules/type_label/Dangerfile'
+    - 'Dangerfile'
+    - 'Gemfile'
+    - 'Guardfile'
+    - 'Rakefile'
+    - 'gitlab-dangerfiles.gemspec'
+    - 'lib/danger/rules/z_add_labels/Dangerfile'
+    - 'lib/danger/rules/z_retry_link/Dangerfile'
+    - 'lib/gitlab-dangerfiles.rb'
+    - 'lib/gitlab/Dangerfile'
+    - 'lib/gitlab/dangerfiles.rb'
+    - 'lib/gitlab/dangerfiles/commit_messages_helper.rb'
+    - 'lib/gitlab/dangerfiles/spec_helper.rb'
+    - 'lib/gitlab/dangerfiles/task_loader.rb'
+    - 'lib/gitlab/dangerfiles/version.rb'
+    - 'spec/gitlab/dangerfiles/version_spec.rb'
+    - 'spec/spec_helper.rb'
+    - 'spec/support/danger_spec_helper.rb'
 
 # Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Style/HashExcept:
   Exclude:
     - 'lib/gitlab/dangerfiles.rb'
@@ -322,34 +291,24 @@ Style/HashSyntax:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowIfModifier.
-Style/IfInsideElse:
-  Exclude:
-    - 'lib/danger/rules/commit_messages/Dangerfile'
-
-# Offense count: 22
+# Offense count: 18
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
     - 'lib/danger/plugins/changelog.rb'
     - 'lib/danger/plugins/roulette.rb'
-    - 'lib/danger/rules/commit_messages/Dangerfile'
-    - 'lib/danger/rules/commits_counter/Dangerfile'
     - 'lib/danger/rules/simple_roulette/Dangerfile'
     - 'lib/danger/rules/z_retry_link/Dangerfile'
     - 'lib/gitlab/dangerfiles.rb'
     - 'lib/gitlab/dangerfiles/base_linter.rb'
     - 'lib/gitlab/dangerfiles/commit_linter.rb'
 
-# Offense count: 3
+# Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
 Style/MutableConstant:
   Exclude:
-    - 'lib/danger/rules/commit_messages/Dangerfile'
     - 'lib/danger/rules/simple_roulette/Dangerfile'
     - 'lib/gitlab/dangerfiles/version.rb'
 
@@ -370,7 +329,7 @@ Style/NumericPredicate:
     - 'lib/danger/plugins/roulette.rb'
     - 'lib/gitlab/dangerfiles/teammate.rb'
 
-# Offense count: 8
+# Offense count: 7
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -381,7 +340,7 @@ Style/PercentLiteralDelimiters:
     - 'lib/gitlab/dangerfiles/tasks/main.rake'
     - 'spec/danger/plugins/internal/helper_spec.rb'
 
-# Offense count: 4
+# Offense count: 10
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: .
 # SupportedStyles: same_as_string_literals, single_quotes, double_quotes
@@ -405,7 +364,7 @@ Style/RedundantFreeze:
     - 'lib/gitlab/dangerfiles/emoji_checker.rb'
     - 'lib/gitlab/dangerfiles/title_linting.rb'
 
-# Offense count: 4
+# Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantRegexpEscape:
   Exclude:
@@ -413,13 +372,7 @@ Style/RedundantRegexpEscape:
     - 'lib/gitlab/dangerfiles/emoji_checker.rb'
     - 'lib/gitlab/dangerfiles/title_linting.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantSelf:
-  Exclude:
-    - 'lib/danger/rules/commit_messages/Dangerfile'
-
-# Offense count: 2
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
@@ -434,7 +387,7 @@ Style/RescueModifier:
   Exclude:
     - 'lib/gitlab/dangerfiles/commit_linter.rb'
 
-# Offense count: 3
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
@@ -442,15 +395,6 @@ Style/RescueStandardError:
   Exclude:
     - 'lib/danger/plugins/changelog.rb'
     - 'lib/danger/plugins/internal/helper.rb'
-    - 'lib/danger/plugins/roulette.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
-# AllowedMethods: present?, blank?, presence, try, try!
-Style/SafeNavigation:
-  Exclude:
-    - 'lib/danger/rules/commit_messages/Dangerfile'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -458,14 +402,6 @@ Style/SelectByRegexp:
   Exclude:
     - 'lib/danger/plugins/internal/helper.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: only_raise, only_fail, semantic
-Style/SignalException:
-  Exclude:
-    - 'lib/danger/rules/type_label/Dangerfile'
-
 # Offense count: 7
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
@@ -475,35 +411,24 @@ Style/StringConcatenation:
     - 'spec/gitlab/dangerfiles/commit_linter_spec.rb'
     - 'spec/gitlab/merge_request_linter_spec.rb'
 
-# Offense count: 7
+# Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiteralsInInterpolation:
   Exclude:
     - 'lib/danger/plugins/internal/helper.rb'
-    - 'lib/danger/plugins/roulette.rb'
-    - 'lib/danger/rules/commit_messages/Dangerfile'
     - 'spec/gitlab/dangerfiles/teammate_spec.rb'
 
-# Offense count: 2
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, IgnoredMethods, AllowComments.
-# AllowedMethods: respond_to, define_method
+# AllowedMethods: define_method, mail, respond_to
 Style/SymbolProc:
   Exclude:
-    - 'lib/danger/rules/commit_messages/Dangerfile'
     - 'spec/gitlab/dangerfiles_spec.rb'
 
-# Offense count: 19
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArguments:
-  Exclude:
-    - 'spec/danger/plugins/roulette_spec.rb'
-
-# Offense count: 24
+# Offense count: 25
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
@@ -520,7 +445,9 @@ Style/TrailingCommaInArrayLiteral:
     - 'spec/gitlab/dangerfiles/weightage/maintainers_spec.rb'
     - 'spec/gitlab/dangerfiles/weightage/reviewers_spec.rb'
 
-Style/ArrayIntersect:
-  Exclude:
-    - 'lib/gitlab/dangerfiles/category.rb'
-    - 'lib/danger/plugins/changelog.rb'
+# Offense count: 111
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 374

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.2.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-dangerfiles (4.10.0)
+    gitlab-dangerfiles (4.11.0)
       danger (>= 9.3.0)
       danger-gitlab (>= 8.0.0)
       rake (~> 13.0)

data/lefthook.yml

@@ -12,3 +12,8 @@ pre-push:
     rubocop:
       run: bundle exec rubocop
       glob: '*.rb'
+
+    danger:
+      files: git diff --name-only $(git merge-base origin/master HEAD)..HEAD
+      # We need to specify {files} as part of the command, otherwise it won't execute the hook
+      run: echo {files} >/dev/null && bundle exec danger dry_run

data/lib/danger/plugins/commit_messages.rb

@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+require_relative "../../gitlab/dangerfiles/commit_linter"
+require_relative "../../gitlab/dangerfiles/merge_request_linter"
+
+module Danger
+  # Common helper functions for our danger scripts. See Danger::Helper
+  # for more details
+  class CommitMessages < Danger::Plugin
+    COMMIT_MSG_DOC = "https://docs.gitlab.com/ee/development/contributing/merge_request_workflow.html#commit-messages-guidelines"
+    MORE_INFO = "For more information, take a look at our [Commit message guidelines](#{COMMIT_MSG_DOC}).".freeze
+    THE_DANGER_JOB_TEXT = "the `%<job_name>s` job"
+    MAX_COMMITS_COUNT_EXCEEDED_MESSAGE = <<~MSG
+      This merge request includes more than %<max_commits_count>d commits. Each commit should meet the following criteria:
+
+      1. Have a well-written commit message.
+      1. Has all tests passing when used on its own (e.g. when using git checkout SHA).
+      1. Can be reverted on its own without also requiring the revert of commit that came before it.
+      1. Is small enough that it can be reviewed in isolation in under 30 minutes or so.
+
+      If this merge request contains commits that do not meet this criteria and/or contains intermediate work, please rebase these commits into a smaller number of commits or split this merge request into multiple smaller merge requests.
+    MSG
+
+    def build_message(commit, message, more_info: true)
+      [message].tap do |full_message|
+        full_message << ". #{MORE_INFO}" if more_info
+        full_message.unshift("#{commit.sha}: ") if commit.sha
+      end.join
+    end
+
+    def fail_commit(commit, message, more_info: true)
+      self.fail(build_message(commit, message, more_info: more_info))
+    end
+
+    def warn_commit(commit, message, more_info: true)
+      self.warn(build_message(commit, message, more_info: more_info))
+    end
+
+    def danger_job_link
+      if helper.ci?
+        "[#{format(THE_DANGER_JOB_TEXT, job_name: ENV.fetch('CI_JOB_NAME', nil))}](#{ENV.fetch('CI_JOB_URL', nil)})"
+      else
+        THE_DANGER_JOB_TEXT
+      end
+    end
+
+    # Perform various checks against commits. We're not using
+    # https://github.com/jonallured/danger-commit_lint because its output is not
+    # very helpful, and it doesn't offer the means of ignoring merge commits.
+    def lint_commit(commit)
+      linter = Gitlab::Dangerfiles::CommitLinter.new(commit)
+
+      # For now we'll ignore merge commits, as getting rid of those is a problem
+      # separate from enforcing good commit messages.
+      return linter if linter.merge?
+
+      # We ignore revert commits as they are well structured by Git already
+      return linter if linter.revert?
+
+      # If MR is set to squash, we ignore fixup commits
+      return linter if linter.fixup? && helper.squash_mr?
+
+      if linter.fixup?
+        msg = "Squash or fixup commits must be squashed before merge, or **edit** the merge request, " \
+              "enable **Squash commits when merge request is accepted** and re-run #{danger_job_link}."
+
+        if helper.draft_mr? || helper.squash_mr?
+          warn_commit(commit, msg, more_info: false)
+        else
+          fail_commit(commit, msg, more_info: false)
+        end
+
+        # Makes no sense to process other rules for fixup commits, they trigger just more noise
+        return linter
+      end
+
+      # Fail if a suggestion commit is used and squash is not enabled
+      if linter.suggestion?
+        unless helper.squash_mr?
+          msg = "If you are applying suggestions, **edit** the merge request, enable **Squash commits when " \
+                "merge request is accepted** and re-run #{danger_job_link}."
+          fail_commit(commit, msg, more_info: false)
+        end
+
+        return linter
+      end
+
+      linter.lint
+    end
+
+    def lint_mr_title(mr_title)
+      commit = Struct.new(:message, :sha).new(mr_title)
+
+      Gitlab::Dangerfiles::MergeRequestLinter.new(commit).lint
+    end
+
+    def count_non_fixup_commits(commit_linters)
+      commit_linters.count { |commit_linter| !commit_linter.fixup? }
+    end
+
+    def lint_commits(commits)
+      commit_linters = commits.map { |commit| lint_commit(commit) }
+
+      if helper.squash_mr?
+        multi_line_commit_linter = commit_linters.detect do |commit_linter|
+          !commit_linter.merge? && commit_linter.multi_line?
+        end
+
+        if multi_line_commit_linter&.failed?
+          warn_or_fail_commits(multi_line_commit_linter)
+          commit_linters.delete(multi_line_commit_linter) # Don't show an error (here) and a warning (below)
+        end
+      elsif count_non_fixup_commits(commit_linters) > max_commits_count
+        self.warn(format(MAX_COMMITS_COUNT_EXCEEDED_MESSAGE, max_commits_count: max_commits_count))
+      end
+
+      failed_commit_linters = commit_linters.select(&:failed?)
+      warn_or_fail_commits(failed_commit_linters, default_to_fail: !helper.squash_mr?)
+    end
+
+    def max_commits_count
+      helper.config.max_commits_count
+    end
+
+    def warn_or_fail_commits(failed_linters, default_to_fail: true)
+      level = default_to_fail ? :fail : :warn
+
+      Array(failed_linters).each do |linter|
+        linter.problems.each do |problem_key, problem_desc|
+          case problem_key
+          when :subject_too_short, :details_too_many_changes, :details_line_too_long
+            warn_commit(linter.commit, problem_desc)
+          else
+            __send__(:"#{level}_commit", linter.commit, problem_desc)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/danger/plugins/internal/helper.rb

@@ -25,8 +25,6 @@ module Danger
       pipeline: '~"maintenance::pipelines" for CI',
       ci_template: '~"ci::templates"',
       analytics_instrumentation: '~"analytics instrumentation"',
-      import_integrate_be: '~"group::import and integrate" (backend)',
-      import_integrate_fe: '~"group::import and integrate" (frontend)',
       Authentication: '~"group::authentication"',
       Authorization: '~"group::authorization"',
       Compliance: '~"group::compliance"',

data/lib/danger/plugins/roulette.rb

@@ -9,6 +9,7 @@ module Danger
   # for more details
   class Roulette < Danger::Plugin
     HOURS_WHEN_PERSON_CAN_BE_PICKED = (6..14).freeze
+    BOT_REVIEWERS = %w[GitLabDuo].freeze
     HTTPError = Class.new(StandardError)
 
     def prepare_categories(changes_keys)
@@ -91,7 +92,7 @@ module Danger
     #
     # @param spins [Array<Spin>] The roulette spins to potentially assign from
     def assign_reviewers_from_roulette(spins)
-      return if helper.mr_reviewers.any?
+      return if human_reviewers?
 
       reviewers_to_assign = find_reviewers_to_assign(spins)
 
@@ -188,6 +189,13 @@ module Danger
       @labels ||= helper.mr_labels
     end
 
+    # Checks if any non-bot reviewers are already assigned to the merge request
+    #
+    # @return [Boolean]
+    def human_reviewers?
+      helper.mr_reviewers.any? { |reviewer| !BOT_REVIEWERS.include?(reviewer["username"]) }
+    end
+
     # Find reviewers to assign based on configured roles
     #
     # @param spins [Array<Spin>] The roulette spins

data/lib/danger/rules/commit_messages/Dangerfile

@@ -1,127 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../../../gitlab/dangerfiles/commit_linter"
-require_relative "../../../gitlab/dangerfiles/merge_request_linter"
-
-COMMIT_MESSAGE_GUIDELINES = "https://docs.gitlab.com/ee/development/contributing/merge_request_workflow.html#commit-messages-guidelines"
-MORE_INFO = "For more information, take a look at our [Commit message guidelines](#{COMMIT_MESSAGE_GUIDELINES})."
-THE_DANGER_JOB_TEXT = "the `%<job_name>s` job"
-MAX_COMMITS_COUNT = helper.config.max_commits_count
-MAX_COMMITS_COUNT_EXCEEDED_MESSAGE = <<~MSG
-This merge request includes more than %<max_commits_count>d commits. Each commit should meet the following criteria:
-
-1. Have a well-written commit message.
-1. Has all tests passing when used on its own (e.g. when using git checkout SHA).
-1. Can be reverted on its own without also requiring the revert of commit that came before it.
-1. Is small enough that it can be reviewed in isolation in under 30 minutes or so.
-
-If this merge request contains commits that do not meet this criteria and/or contains intermediate work, please rebase these commits into a smaller number of commits or split this merge request into multiple smaller merge requests.
-MSG
-
-def fail_commit(commit, message, more_info: true)
-  self.fail(build_message(commit, message, more_info: more_info))
-end
-
-def warn_commit(commit, message, more_info: true)
-  self.warn(build_message(commit, message, more_info: more_info))
-end
-
-def build_message(commit, message, more_info: true)
-  [message].tap do |full_message|
-    full_message << ". #{MORE_INFO}" if more_info
-    full_message.unshift("#{commit.sha}: ") if commit.sha
-  end.join
-end
-
-def danger_job_link
-  helper.ci? ? "[#{format(THE_DANGER_JOB_TEXT, job_name: ENV["CI_JOB_NAME"])}](#{ENV['CI_JOB_URL']})" : THE_DANGER_JOB_TEXT
-end
-
-# Perform various checks against commits. We're not using
-# https://github.com/jonallured/danger-commit_lint because its output is not
-# very helpful, and it doesn't offer the means of ignoring merge commits.
-def lint_commit(commit)
-  linter = Gitlab::Dangerfiles::CommitLinter.new(commit)
-
-  # For now we'll ignore merge commits, as getting rid of those is a problem
-  # separate from enforcing good commit messages.
-  return linter if linter.merge?
-
-  # We ignore revert commits as they are well structured by Git already
-  return linter if linter.revert?
-
-  # If MR is set to squash, we ignore fixup commits
-  return linter if linter.fixup? && helper.squash_mr?
-
-  if linter.fixup?
-    msg = "Squash or fixup commits must be squashed before merge, or **edit** the merge request, enable **Squash commits when merge request is accepted** and re-run #{danger_job_link}."
-    if helper.draft_mr? || helper.squash_mr?
-      warn_commit(commit, msg, more_info: false)
-    else
-      fail_commit(commit, msg, more_info: false)
-    end
-
-    # Makes no sense to process other rules for fixup commits, they trigger just more noise
-    return linter
-  end
-
-  # Fail if a suggestion commit is used and squash is not enabled
-  if linter.suggestion?
-    unless helper.squash_mr?
-      fail_commit(commit, "If you are applying suggestions, **edit** the merge request, enable **Squash commits when merge request is accepted** and re-run #{danger_job_link}.", more_info: false)
-    end
-
-    return linter
-  end
-
-  linter.lint
-end
-
-def lint_mr_title(mr_title)
-  commit = Struct.new(:message, :sha).new(mr_title)
-
-  Gitlab::Dangerfiles::MergeRequestLinter.new(commit).lint
-end
-
-def count_non_fixup_commits(commit_linters)
-  commit_linters.count { |commit_linter| !commit_linter.fixup? }
-end
-
-def lint_commits(commits)
-  commit_linters = commits.map { |commit| lint_commit(commit) }
-
-  if helper.squash_mr?
-    multi_line_commit_linter = commit_linters.detect { |commit_linter| !commit_linter.merge? && commit_linter.multi_line? }
-
-    if multi_line_commit_linter && multi_line_commit_linter.failed?
-      warn_or_fail_commits(multi_line_commit_linter)
-      commit_linters.delete(multi_line_commit_linter) # Don't show an error (here) and a warning (below)
-    end
-  else
-    if count_non_fixup_commits(commit_linters) > MAX_COMMITS_COUNT
-      self.warn(format(MAX_COMMITS_COUNT_EXCEEDED_MESSAGE, max_commits_count: MAX_COMMITS_COUNT))
-    end
-  end
-
-  failed_commit_linters = commit_linters.select { |commit_linter| commit_linter.failed? }
-  warn_or_fail_commits(failed_commit_linters, default_to_fail: !helper.squash_mr?)
-end
-
-def warn_or_fail_commits(failed_linters, default_to_fail: true)
-  level = default_to_fail ? :fail : :warn
-
-  Array(failed_linters).each do |linter|
-    linter.problems.each do |problem_key, problem_desc|
-      case problem_key
-      when :subject_too_short, :details_too_many_changes, :details_line_too_long
-        warn_commit(linter.commit, problem_desc)
-      else
-        self.__send__(:"#{level}_commit", linter.commit, problem_desc)
-      end
-    end
-  end
-end
-
 # As part of https://gitlab.com/groups/gitlab-org/-/epics/4826 we are
 # vendoring workhorse commits from the stand-alone gitlab-workhorse
 # repo. There is no point in linting commits that we want to vendor as
@@ -130,4 +8,4 @@ def workhorse_changes?
   git.diff.any? { |file| file.path.start_with?('workhorse/') }
 end
 
-lint_commits(git.commits) unless workhorse_changes?
+commit_messages.lint_commits(git.commits) unless workhorse_changes?

data/lib/gitlab/dangerfiles/approval.rb

@@ -10,7 +10,7 @@ module Gitlab
           if rule["section"] == "codeowners"
             "`#{rule['name']}`"
           else
-            rule["section"]
+            rule["section"]&.downcase
           end.to_sym
 
         spin = Spin.new(category, nil, maintainer, :reviewer)

data/lib/gitlab/dangerfiles/capability.rb

@@ -15,8 +15,6 @@ module Gitlab
           none: None,
           test: Test,
           tooling: Tooling,
-          import_integrate_be: ImportIntegrateBE,
-          import_integrate_fe: ImportIntegrateFE,
           ux: UX
         }.freeze
       end
@@ -60,18 +58,6 @@ module Gitlab
         end
       end
 
-      class ImportIntegrateBE < Capability
-        def has_capability?(teammate)
-          kind == :reviewer && teammate.role.match?(/Backend Engineer.+:Import and Integrate/)
-        end
-      end
-
-      class ImportIntegrateFE < Capability
-        def has_capability?(teammate)
-          kind == :reviewer && teammate.role.match?(/Frontend Engineer.+:Import and Integrate/)
-        end
-      end
-
       class UX < Capability
         def has_capability?(teammate)
           super && teammate.member_of_the_group?(labels)

data/lib/gitlab/dangerfiles/commit_linter.rb

@@ -25,8 +25,8 @@ module Gitlab
             "to the commit message, and are displayed as plain text outside of GitLab",
             message_contains_unicode_emoji: "Avoid the use of Unicode Emoji. These add no value to the commit " \
             "message, and may not be displayed properly everywhere",
-            message_contains_short_reference: "Use full URLs instead of short references (`gitlab-org/gitlab#123` or " \
-            "`!123`), as short references are displayed as plain text outside of GitLab"
+            message_contains_short_reference: "Use full URLs instead of short references (`gitlab-org/gitlab#123`, " \
+            "`!123`, or `%12.3`), as short references are displayed as plain text outside of GitLab"
           }
         )
       end

data/lib/gitlab/dangerfiles/spec_helper.rb

@@ -165,28 +165,6 @@ RSpec.shared_context "with teammates" do
     )
   end
 
-  let(:software_engineer_in_import_integrate_fe) do
-    Gitlab::Dangerfiles::Teammate.new(
-      "username" => "software-engineer-in-import-and-integrate-fe",
-      "name" => "Frontend Engineer in Import and Integrate",
-      "role" => "AnyRole Frontend Engineer, AnyStage:Import and Integrate",
-      "projects" => { "gitlab" => "reviewer frontend" },
-      "available" => true,
-      "tz_offset_hours" => 2.0
-    )
-  end
-
-  let(:software_engineer_in_import_integrate_be) do
-    Gitlab::Dangerfiles::Teammate.new(
-      "username" => "software-engineer-in-import-and-integrate-be",
-      "name" => "Backend Engineer in Import and Integrate",
-      "role" => "AnyRole Backend Engineer, AnyStage:Import and Integrate",
-      "projects" => { "gitlab" => "reviewer backend" },
-      "available" => true,
-      "tz_offset_hours" => 2.0
-    )
-  end
-
   let(:tooling_reviewer) do
     Gitlab::Dangerfiles::Teammate.new(
       "username" => "eng-prod-reviewer",
@@ -220,28 +198,6 @@ RSpec.shared_context "with teammates" do
     )
   end
 
-  let(:import_and_integrate_backend_reviewer) do
-    Gitlab::Dangerfiles::Teammate.new(
-      "username" => "import-and-integrate-backend-reviewer",
-      "name" => "Import and Integrate BE engineer",
-      "role" => "AnyRole Backend Engineer, AnyStage:Import and Integrate",
-      "projects" => { "gitlab" => "reviewer backend" },
-      "available" => backend_reviewer_available,
-      "tz_offset_hours" => 2.0
-    )
-  end
-
-  let(:import_and_integrate_frontend_reviewer) do
-    Gitlab::Dangerfiles::Teammate.new(
-      "username" => "import-and-integrate-frontend-reviewer",
-      "name" => "Import and Integrate FE engineer",
-      "role" => "AnyRole Frontend Engineer, AnyStage:Import and Integrate",
-      "projects" => { "gitlab" => "reviewer frontend" },
-      "available" => true,
-      "tz_offset_hours" => 2.0
-    )
-  end
-
   let(:workhorse_reviewer) do
     Gitlab::Dangerfiles::Teammate.new(
       "username" => "workhorse-reviewer",
@@ -276,11 +232,7 @@ RSpec.shared_context "with teammates" do
       ci_template_reviewer.to_h,
       workhorse_reviewer.to_h,
       workhorse_maintainer.to_h,
-      analytics_instrumentation_reviewer.to_h,
-      import_and_integrate_backend_reviewer.to_h,
-      import_and_integrate_frontend_reviewer.to_h,
-      software_engineer_in_import_integrate_fe.to_h,
-      software_engineer_in_import_integrate_be.to_h
+      analytics_instrumentation_reviewer.to_h
     ]
   end
 

data/lib/gitlab/dangerfiles/spinner.rb

@@ -17,9 +17,7 @@ module Gitlab
         @author = author
         @team_author = team_author
         @labels = labels
-        @categories = categories.reject do |category|
-          import_and_integrate_reject_category?(project, category, labels)
-        end
+        @categories = categories
         @random = random
         @ux_fallback_wider_community_reviewer = ux_fallback_wider_community_reviewer
       end
@@ -62,8 +60,6 @@ module Gitlab
               # Fetch an already picked maintainer, or pick one otherwise
               spin.maintainer = backend_spin&.maintainer || frontend_spin&.maintainer || spin_for_category(:backend).maintainer
             end
-          when :import_integrate_be, :import_integrate_fe
-            spin.optional_role = :maintainer
           when :ux
             spin.optional_role = :maintainer
 
@@ -98,15 +94,6 @@ module Gitlab
 
       attr_reader :random, :ux_fallback_wider_community_reviewer
 
-      # Reject Import and Integrate categories if the MR author has reviewing abilities for the category.
-      #
-      # @param [String] category name
-      # @return [Boolean]
-      def import_and_integrate_reject_category?(project, category, labels)
-        [:import_integrate_be, :import_integrate_fe].include?(category) && team_author &&
-          (team_author.reviewer?(project, category, labels) || team_author.maintainer?(project, category, labels))
-      end
-
       # MR includes QA changes, but also other changes, and author isn't an SET
       def author_no_qa_capability?
         !(team_author && team_author.capabilities(project).any? { |capability| capability.end_with?("qa") })

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "4.10.0"
+    VERSION = "4.11.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.11.0
 platform: ruby
 authors:
 - GitLab
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-25 00:00:00.000000000 Z
+date: 2026-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -222,6 +222,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".tool-versions"
 - ".yardopts"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -239,6 +240,7 @@ files:
 - gitlab-dangerfiles.gemspec
 - lefthook.yml
 - lib/danger/plugins/changelog.rb
+- lib/danger/plugins/commit_messages.rb
 - lib/danger/plugins/duo_code.rb
 - lib/danger/plugins/internal/helper.rb
 - lib/danger/plugins/roulette.rb