gitlab-dangerfiles 4.12.0 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 053ccbe5f18fd65ff059c590e4de66d82b8632aa368453f48e5be40bba809e47
-  data.tar.gz: 104c829cb3c5e1113fb890885abdac06e413d7076b45f26ee406b3d6d38f1fed
+  metadata.gz: e62a200646d128a780ee1e17bb644f5fe296fef2f530631ebdabe677a2eea93f
+  data.tar.gz: 73aec620889b66c1c7f61fe845ab2b43c528c21301ed7b1bb4a8b6ad6e93656b
 SHA512:
-  metadata.gz: 1b0098a095fb630bb6301e2ad78c8d0709b4fdab22de3fb929a306954dd87026f4111e48f17d19d94fc7d62906f9ac413e0879d91df47c976622854b3dd63dca
-  data.tar.gz: 44009f0ea1dc871c36608df7ee2d3d3a28f7c92692573c54781b8fecc36e37965fed1d972004cfef2539904f07820eabf84c06bea8216b12264e36d6732a3951
+  metadata.gz: cfaa1d404d59cb656354135dd146d6ea908046f51430fd5d4f7d9aa83f13446bed69f7dc21b018a8f9e6154b6a65b5abf0a3fc90c6863986702b2b64403ffa81
+  data.tar.gz: 6300e9593543c6f635ced6fb6b1c9d04773bf1baac66d0dbc7bb2957607196f094d2a429e2372c64dcdbc31b331047e40ac387e2b99bd7b2777d52956c3e6b25

data/.gitlab/CODEOWNERS

@@ -1 +1 @@
-* @gl-dx/eng-prod
+* @gl-dx

data/CONTRIBUTING.md

@@ -6,7 +6,7 @@ Except for the license granted herein to GitLab B.V. and recipients of software
 distributed by GitLab B.V., you reserve all right, title, and interest in and to
 your Contributions.
 
-All contributions are subject to the Developer Certificate of Origin and license set out at [docs.gitlab.com/ce/legal/developer_certificate_of_origin](https://docs.gitlab.com/ce/legal/developer_certificate_of_origin).
+All contributions are subject to the Developer Certificate of Origin and license set out at [docs.gitlab.com/legal/developer_certificate_of_origin](https://docs.gitlab.com/legal/developer_certificate_of_origin/).
 
 _This notice should stay as the first item in the CONTRIBUTING.md file._
 

data/Gemfile.lock

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

data/README.md

@@ -148,7 +148,7 @@ Danger rules are located under `lib/danger/rules`.
 
 #### `changelog`
 
-This rule ensures the merge request follows our [Changelog guidelines](https://docs.gitlab.com/ee/development/changelog.html#changelog-entries).
+This rule ensures the merge request follows our [Changelog guidelines](https://docs.gitlab.com/development/changelog/).
 
 #### `changes_size`
 
@@ -169,16 +169,10 @@ This rule ensures the merge request isn't too big to be reviewed, otherwise it s
 
 #### `commits_counter`
 
-This rule posts a failure if the merge request has more than 20 commits.
+This rule posts a warning if the merge request has more than 20 commits.
 
-#### `danger_code_review`
-
-This rule posts a warning/failure when `@GitLabDuo` isn't assigned as a reviewer.
-
-##### Available configurations
-
-- `duo_code_review`: Whether a review from GitLab Duo Code is `:mandatory` or `:optional`.
-  Default to `:optional`.
+For merge requests in [`gitlab-org/gitlab`](https://gitlab.com/gitlab-org/gitlab), it posts a failure
+instead, unless the merge request is set to squash commits.
 
 #### `metadata`
 
@@ -225,6 +219,32 @@ helper.config.auto_assign_for_roulette_roles = [:reviewer]
 helper.config.auto_assign_for_roulette_labels = ["maintenance::dependency"]
 ```
 
+##### CODEOWNERS boost
+
+By default, the roulette selects reviewers and maintainers purely based on category membership and
+capacity weights. You can optionally give CODEOWNERS-eligible approvers additional weight in the
+selection pool, making them more likely to be picked without hard-gating on them.
+
+Configure `codeowners_reviewer_boost_for_roulette` and/or `codeowners_maintainer_boost_for_roulette`
+with a positive integer to add that many extra entries in the weighted pool for matching reviewers
+or maintainers. The boost stacks on top of existing capacity, hungry, and traintainer weights.
+
+```ruby
+# Prefer code owners for review, but not for maintainer approval
+helper.config.codeowners_reviewer_boost_for_roulette = 3
+
+# Prefer code owners for both review and maintainer approval
+helper.config.codeowners_reviewer_boost_for_roulette = 3
+helper.config.codeowners_maintainer_boost_for_roulette = 2
+```
+
+| Value | Behavior |
+|-------|----------|
+| `0` (default) | No change — existing behavior preserved |
+| `1-2` | Mild preference for code owners |
+| `3` | Recommended — meaningful preference without starving non-owners |
+| `4+` | Strong preference — use with caution on small teams |
+
 ##### Available configurations
 
 Note: These options aren't actually used in the `simple_roulette` rule, but can be used in your own
@@ -253,17 +273,15 @@ In order to run `danger` on GitLab CI, perform the following steps:
 
 1. If not yet done, create a `Dangerfile` at the top-level of your project. Refer to [Usage](#usage) to
    see how to set it up.
-2. In `.gitlab-ci.yml`, include [CI configuration](https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/danger-review.yml)
-   which defines `danger-review` [CI job](https://docs.gitlab.com/ee/ci/jobs/):
+2. In `.gitlab-ci.yml`, include the [`danger-review` CI/CD component](https://gitlab.com/gitlab-org/components/danger-review)
+   which defines the `danger-review` [CI job](https://docs.gitlab.com/ee/ci/jobs/):
 
 ```yaml
 include:
-  - project: 'gitlab-org/quality/pipeline-common'
-    file:
-      - '/ci/danger-review.yml'
+  - component: gitlab.com/gitlab-org/components/danger-review/danger-review@~latest
 ```
 
-3. Create a [Project or group access token](https://docs.gitlab.com/ee/user/project/settings/project_access_tokens.html)
+3. Create a [Project or group access token](https://docs.gitlab.com/user/project/settings/project_access_tokens/)
    with scope `api` and role `Developer`.
 4. Add a [CI/CD variable](https://docs.gitlab.com/ee/ci/variables/#add-a-cicd-variable-to-a-project)
    `DANGER_GITLAB_API_TOKEN` (`Masked` but not `Protected`) and use Project access token as value.
@@ -274,25 +292,20 @@ See a [real world example](https://gitlab.com/gitlab-org/ruby/gems/gitlab-styles
 
 Danger is a Ruby project and uses [`bundler`](https://bundler.io/) to manage
 its dependencies. This requires a project to have a `Gemfile` and
-`Gemfile.lock` commited. This is helpful especially if Danger is also used
+`Gemfile.lock` committed. This is helpful especially if Danger is also used
 locally - with `lefthook`, for example.
 
-In order to skip Ruby and `bundler` dependency in a project, use `bundle` commands directly
-in the CI configuration:
+You don't need a `Gemfile` to use the `danger-review` component. If your project
+has no `Gemfile`, the component creates one and adds the latest `gitlab-dangerfiles`
+to it before it runs Danger.
+
+To pin the `gitlab-dangerfiles` version instead, set the `gitlab_dangerfiles_version` input:
 
 ```yaml
 include:
-  - project: 'gitlab-org/quality/pipeline-common'
-    file: '/ci/danger-review.yml'
-
-danger-review:
-  before_script:
-    - bundle init
-    # For latest version
-    - bundle add gitlab-dangerfiles
-    # OR
-    # For a pinned version
-    - bundle add gitlab-dangerfiles --version 3.1.0
+  - component: gitlab.com/gitlab-org/components/danger-review/danger-review@~latest
+    inputs:
+      gitlab_dangerfiles_version: "4.12.0"
 ```
 
 ## Local Danger Rake task
@@ -330,7 +343,7 @@ The following lint violations generate warnings:
 1. The commit changes too many lines across too many files without describing the changes in the commit body ([code](https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles/blob/bccb167/lib/gitlab/dangerfiles/commit_linter.rb#L83-85)).
 1. The commit body contains too many characters per line ([code](https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles/blob/bccb167/lib/gitlab/dangerfiles/commit_linter.rb#L87-96)).
 
-All other lint violations generate errors, except when the MR has [Squash commits when merge request is accepted](https://docs.gitlab.com/ee/user/project/merge_requests/squash_and_merge.html#squash-commits-in-a-merge-request) enabled, which downgrades lint violations to warnings.
+All other lint violations generate errors, except when the MR has [Squash commits when merge request is accepted](https://docs.gitlab.com/user/project/merge_requests/squash_and_merge/#squash-commits-in-a-merge-request) enabled, which downgrades lint violations to warnings.
 
 ## Documentation
 
@@ -368,9 +381,9 @@ See an [example](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92580) fo
 
 ## Contributing
 
-Bug reports and merge requests are welcome at https://gitlab.com/gitlab-org/gitlab-dangerfiles. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://gitlab.com/gitlab-org/gitlab-dangerfiles/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and merge requests are welcome at https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles/blob/master/CODE_OF_CONDUCT.md).
 
-Make sure to include a changelog entry in your commit message and read the [changelog entries section](https://docs.gitlab.com/ee/development/changelog.html).
+Make sure to include a changelog entry in your commit message and read the [changelog entries section](https://docs.gitlab.com/development/changelog/).
 
 ## Release
 
@@ -402,4 +415,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Gitlab::Danger project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://gitlab.com/gitlab-org/gitlab-dangerfiles/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Gitlab::Danger project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles/blob/master/CODE_OF_CONDUCT.md).

data/lefthook.yml

@@ -1,5 +1,5 @@
 # Lefthook configuration. For more information, see:
-# https://github.com/Arkweid/lefthook/blob/master/docs/full_guide.md
+# https://lefthook.dev/configuration/
 
 pre-push:
   commands:

data/lib/danger/plugins/changelog.rb

@@ -13,34 +13,34 @@ module Danger
     NO_CHANGELOG_CATEGORIES = %i[docs none].freeze
     CHANGELOG_TRAILER_REGEX = /^(?<name>Changelog):\s*(?<category>.+)$/i.freeze
     CHANGELOG_EE_TRAILER_REGEX = /^EE: true$/.freeze
-    CHANGELOG_MODIFIED_URL_TEXT = "**CHANGELOG.md was edited.** Please remove the additions and follow the [changelog guidelines](https://docs.gitlab.com/ee/development/changelog.html).\n\n"
-    CHANGELOG_MISSING_URL_TEXT = "**[CHANGELOG missing](https://docs.gitlab.com/ee/development/changelog.html)**:\n\n"
+    CHANGELOG_MODIFIED_URL_TEXT = "**CHANGELOG.md was edited.** Please remove the additions and follow the [changelog guidelines](https://docs.gitlab.com/development/changelog/).\n\n"
+    CHANGELOG_MISSING_URL_TEXT = "**[CHANGELOG missing](https://docs.gitlab.com/development/changelog/)**:\n\n"
     IF_REVERT_MR_TEXT = <<~MARKDOWN
-      In a revert merge request? Use the revert merge request template to add labels [that skip changelog checks](https://docs.gitlab.com/ee/development/pipelines#revert-mrs).
+      In a revert merge request? Use the revert merge request template to add labels [that skip changelog checks](https://docs.gitlab.com/development/pipelines/#revert-mrs).
 
       Reverting something in the current milestone? A changelog isn't required. Skip changelog checks by adding `~"regression:*"` label, then re-run the danger job (there is a link at the bottom of this comment).
     MARKDOWN
 
     OPTIONAL_CHANGELOG_MESSAGE = {
-      local: "If this merge request [doesn't need a CHANGELOG entry](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry), feel free to ignore this message.",
+      local: "If this merge request [doesn't need a CHANGELOG entry](https://docs.gitlab.com/development/changelog/#what-warrants-a-changelog-entry), feel free to ignore this message.",
       ci: <<~MSG
         If this merge request needs a changelog entry, add the `Changelog` trailer to the commit message you want to add to the changelog.
 
-        If this merge request [doesn't need a CHANGELOG entry](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry), feel free to ignore this message.
+        If this merge request [doesn't need a CHANGELOG entry](https://docs.gitlab.com/development/changelog/#what-warrants-a-changelog-entry), feel free to ignore this message.
       MSG
     }.freeze
-    SEE_DOC = "See the [changelog documentation](https://docs.gitlab.com/ee/development/changelog.html)."
+    SEE_DOC = "See the [changelog documentation](https://docs.gitlab.com/development/changelog/)."
 
     REQUIRED_CHANGELOG_REASONS = {
       db_changes: "introduces a database migration",
       feature_flag_removed: "removes a feature flag"
     }.freeze
     REQUIRED_CHANGELOG_MESSAGE = {
-      local: "This merge request requires a changelog entry because it [%<reason>s](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry).",
+      local: "This merge request requires a changelog entry because it [%<reason>s](https://docs.gitlab.com/development/changelog/#what-warrants-a-changelog-entry).",
       ci: <<~MSG
         To create a changelog entry, add the `Changelog` trailer to one of your Git commit messages.
 
-        This merge request requires a changelog entry because it [%<reason>s](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry).
+        This merge request requires a changelog entry because it [%<reason>s](https://docs.gitlab.com/development/changelog/#what-warrants-a-changelog-entry).
       MSG
     }.freeze
     DEFAULT_CHANGELOG_CATEGORIES = %w[
@@ -191,15 +191,15 @@ module Danger
       ee_changes = helper.changed_files(%r{\Aee/})
 
       if ee_changes.any? && !ee_changelog? && !required?
-        check_result.warning("This MR changes code in `ee/`, but its Changelog commit is missing the [`EE: true` trailer](https://docs.gitlab.com/ee/development/changelog.html#gitlab-enterprise-changes). Consider adding it to your Changelog commits.")
+        check_result.warning("This MR changes code in `ee/`, but its Changelog commit is missing the [`EE: true` trailer](https://docs.gitlab.com/development/changelog/#gitlab-enterprise-changes). Consider adding it to your Changelog commits.")
       end
 
       if ee_changes.empty? && ee_changelog?
         check_result.warning("This MR has a Changelog commit for EE, but no code changes in `ee/`. Consider removing the `EE: true` trailer from your commits.")
       end
 
-      if ee_changes.any? && ee_changelog? && required_reasons.include?(:db_changes)
-        check_result.warning("This MR has a Changelog commit with the `EE: true` trailer, but there are database changes which [requires](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry) the Changelog commit to not have the `EE: true` trailer. Consider removing the `EE: true` trailer from your commits.")
+      if ee_changes.any? && ee_changelog? && required_reasons.include?(:db_changes) && non_ee_database_migration_changes?
+        check_result.warning("This MR has a Changelog commit with the `EE: true` trailer, but there are database changes which [requires](https://docs.gitlab.com/development/changelog/#what-warrants-a-changelog-entry) the Changelog commit to not have the `EE: true` trailer. Consider removing the `EE: true` trailer from your commits.")
       end
 
       check_result
@@ -216,6 +216,12 @@ module Danger
       required_reasons.any?
     end
 
+    def non_ee_database_migration_changes?
+      helper.changes.added.by_category(:migration).any? do |change|
+        !change.file.start_with?("ee/db/")
+      end
+    end
+
     def optional?
       categories_need_changelog? && mr_without_no_changelog_label?
     end

data/lib/danger/plugins/commit_messages.rb

@@ -7,7 +7,7 @@ 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"
+    COMMIT_MSG_DOC = "https://docs.gitlab.com/development/contributing/merge_request_workflow/#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
@@ -102,7 +102,10 @@ module Danger
       commit_linters = commits.map { |commit| lint_commit(commit) }
 
       if helper.squash_mr?
-        multi_line_commit_linter = commit_linters.detect do |commit_linter|
+        # `commits` (and therefore `commit_linters`) is ordered newest-to-oldest, matching `git log`.
+        # We want the oldest multi-line, non-merge commit, since that's the commit whose message is
+        # expected to survive the squash, so we search in reverse order.
+        multi_line_commit_linter = commit_linters.reverse.detect do |commit_linter|
           !commit_linter.merge? && commit_linter.multi_line?
         end
 

data/lib/danger/plugins/roulette.rb

@@ -53,12 +53,19 @@ module Danger
       project = (project || config_project_name).downcase
       categories = categories.map { |category| category&.downcase || :none }
 
+      reviewer_boost = helper.config.codeowners_reviewer_boost_for_roulette
+      maintainer_boost = helper.config.codeowners_maintainer_boost_for_roulette
+      co_usernames = reviewer_boost > 0 || maintainer_boost > 0 ? codeowners_eligible_usernames : Set.new
+
       Gitlab::Dangerfiles::Spinner.new(
         project: project,
         author: helper.mr_author, team_author: team_mr_author,
         labels: labels, categories: categories, random: random,
         ux_fallback_wider_community_reviewer:
-          ux_fallback_wider_community_reviewer)
+          ux_fallback_wider_community_reviewer,
+        codeowners_usernames: co_usernames,
+        codeowners_reviewer_boost: reviewer_boost,
+        codeowners_maintainer_boost: maintainer_boost)
         .spin
     end
 
@@ -120,10 +127,25 @@ module Danger
     private
 
     def ux_fallback_reviewer
-      teammates = %w[pedroms annabeldunstone seggenberger jmiocene clavimoniere]
+      teammates = %w[pedroms seggenberger clavimoniere]
       Gitlab::Dangerfiles::Teammate.find_member(teammates.sample)
     end
 
+    # Collect all CODEOWNERS-eligible approver usernames across qualifying approval rules.
+    #
+    # @return [Set<String>]
+    def codeowners_eligible_usernames
+      approval_rules = helper.mr_approval_state["rules"]
+
+      return Set.new unless approval_rules
+
+      unique_approval_rules(approval_rules).each_with_object(Set.new) do |rule, usernames|
+        next unless spin_for_approval_rule?(rule)
+
+        rule["eligible_approvers"].each { |approver| usernames << approver["username"] }
+      end
+    end
+
     def spin_for_approval_rule?(rule)
       rule["rule_type"] == "code_owner" &&
         should_include_codeowners_rule?(rule) &&

data/lib/gitlab/dangerfiles/base_linter.rb

@@ -7,6 +7,7 @@ module Gitlab
     class BaseLinter
       MIN_SUBJECT_WORDS_COUNT = 3
       MAX_LINE_LENGTH = 72
+      PREFIX_REGEX = /\A(\[[^\]]+\]|[^:\s]+:)\s/
 
       attr_reader :commit, :problems
 
@@ -92,11 +93,17 @@ module Gitlab
         return false if subject_starts_with_a_space?
         return false if ("A".."Z").cover?(subject[0])
 
-        first_char = subject.sub(/\A(\[[^\]]+\]|[^:\s]+:)\s/, "")[0]
-        first_char_downcased = first_char.downcase
-        return true unless ("a".."z").cover?(first_char_downcased)
+        if PREFIX_REGEX.match?(subject)
+          first_char = subject.sub(PREFIX_REGEX, "")[0]
+          return true if first_char.nil?
 
-        first_char.downcase == first_char
+          first_char_downcased = first_char.downcase
+          return true unless ("a".."z").cover?(first_char_downcased)
+
+          false
+        else
+          true
+        end
       end
 
       def subject_ends_with_a_period?

data/lib/gitlab/dangerfiles/capability.rb

@@ -13,7 +13,6 @@ module Gitlab
       def self.category_to_class
         @category_to_class ||= {
           none: None,
-          test: Test,
           tooling: Tooling,
           ux: UX
         }.freeze
@@ -36,16 +35,6 @@ module Gitlab
         end
       end
 
-      class Test < Capability
-        def has_capability?(teammate)
-          return false if kind != :reviewer
-
-          area = teammate.role[/Software Engineer in Test(?:.*?, (\w+))/, 1]
-
-          !!area && labels.any?("devops::#{area.downcase}")
-        end
-      end
-
       class Tooling < Capability
         def has_capability?(teammate)
           if super

data/lib/gitlab/dangerfiles/commit_linter.rb

@@ -46,7 +46,7 @@ module Gitlab
       end
 
       def merge?
-        commit.message.start_with?("Merge branch")
+        commit.message.start_with?("Merge branch", "Merge remote-tracking branch")
       end
 
       def revert?

data/lib/gitlab/dangerfiles/config.rb

@@ -40,11 +40,6 @@ module Gitlab
       #   @return [Integer] the maximum number of allowed non-squashed/non-fixup commits for a given MR. A warning is triggered if the MR has more commits.
       attr_accessor :max_commits_count
 
-      # Rule: duo_code_review
-      # @!attribute duo_code_review
-      #   @return [Symbol] whether a review from GitLab Duo Code is `:mandatory` or `:optional`. Default to `:optional`.
-      attr_accessor :duo_code_review
-
       # Rule: simple_roulette
       # @!attribute included_optional_codeowners_sections_for_roulette
       #   @return [Array] indicating which optional codeowners sections should be included in roulette. Default to `[]`.
@@ -55,6 +50,16 @@ module Gitlab
       #   @return [Array] indicating which required codeowners sections should be excluded from roulette. Default to `[]`.
       attr_accessor :excluded_required_codeowners_sections_for_roulette
 
+      # Rule: simple_roulette
+      # @!attribute codeowners_reviewer_boost_for_roulette
+      #   @return [Integer] extra weight given to reviewers who are CODEOWNERS-eligible approvers for the current merge request. Set to 0 to disable. Default to `0`.
+      attr_accessor :codeowners_reviewer_boost_for_roulette
+
+      # Rule: simple_roulette
+      # @!attribute codeowners_maintainer_boost_for_roulette
+      #   @return [Integer] extra weight given to maintainers who are CODEOWNERS-eligible approvers for the current merge request. Set to 0 to disable. Default to `0`.
+      attr_accessor :codeowners_maintainer_boost_for_roulette
+
       # @!attribute auto_assign_for_roulette_roles
       #   @return [Array<Symbol>] which roles to auto assign as reviewers, given roulette recommendations (:reviewer, :maintainer, or both). If empty, auto-assignment is disabled. Default to `[]`.
       attr_accessor :auto_assign_for_roulette_roles
@@ -77,9 +82,10 @@ module Gitlab
         @disabled_roulette_categories = []
         @included_optional_codeowners_sections_for_roulette = []
         @excluded_required_codeowners_sections_for_roulette = []
+        @codeowners_reviewer_boost_for_roulette = 0
+        @codeowners_maintainer_boost_for_roulette = 0
         @auto_assign_for_roulette_roles = []
         @auto_assign_for_roulette_labels = []
-        @duo_code_review = :optional
       end
     end
   end

data/lib/gitlab/dangerfiles/spec_helper.rb

@@ -154,17 +154,6 @@ RSpec.shared_context "with teammates" do
     )
   end
 
-  let(:software_engineer_in_test) do
-    Gitlab::Dangerfiles::Teammate.new(
-      "username" => "software-engineer-in-test",
-      "name" => "Software Engineer in Test",
-      "role" => "Software Engineer in Test, Create:Source Code",
-      "projects" => { "gitlab" => "maintainer qa", "gitlab-qa" => "maintainer" },
-      "available" => true,
-      "tz_offset_hours" => 2.0
-    )
-  end
-
   let(:tooling_reviewer) do
     Gitlab::Dangerfiles::Teammate.new(
       "username" => "eng-prod-reviewer",
@@ -227,7 +216,6 @@ RSpec.shared_context "with teammates" do
       frontend_maintainer.to_h,
       frontend_reviewer.to_h,
       ux_reviewer.to_h,
-      software_engineer_in_test.to_h,
       tooling_reviewer.to_h,
       ci_template_reviewer.to_h,
       workhorse_reviewer.to_h,

data/lib/gitlab/dangerfiles/spinner.rb

@@ -10,9 +10,14 @@ module Gitlab
     class Spinner
       attr_reader :project, :author, :team_author, :labels, :categories
 
-      def initialize(
+      # @param codeowners_usernames [Set<String>] usernames of CODEOWNERS-eligible approvers for the MR
+      # @param codeowners_reviewer_boost [Integer] extra weight entries for CODEOWNERS-eligible reviewers
+      # @param codeowners_maintainer_boost [Integer] extra weight entries for CODEOWNERS-eligible maintainers
+      def initialize( # rubocop:disable Metrics/ParameterLists -- CODEOWNERS boost params extend the existing signature
         project:, author:, team_author: nil, labels: [], categories: [],
-        random: Random.new, ux_fallback_wider_community_reviewer: nil)
+        random: Random.new, ux_fallback_wider_community_reviewer: nil,
+        codeowners_usernames: Set.new, codeowners_reviewer_boost: 0,
+        codeowners_maintainer_boost: 0)
         @project = project
         @author = author
         @team_author = team_author
@@ -20,9 +25,12 @@ module Gitlab
         @categories = categories
         @random = random
         @ux_fallback_wider_community_reviewer = ux_fallback_wider_community_reviewer
+        @codeowners_usernames = codeowners_usernames
+        @codeowners_reviewer_boost = codeowners_reviewer_boost
+        @codeowners_maintainer_boost = codeowners_maintainer_boost
       end
 
-      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def spin
         spins = categories.sort_by(&:to_s).map do |category|
           spin_for_category(category)
@@ -33,10 +41,7 @@ module Gitlab
 
         spins.each do |spin|
           case spin.category
-          when :qa
-            spin.optional_role = :maintainer if
-              categories.size > 1 && author_no_qa_capability?
-          when :test
+          when :qa, :test
             spin.optional_role = :maintainer
 
             if spin.no_reviewer?
@@ -61,8 +66,6 @@ module Gitlab
               spin.maintainer = backend_spin&.maintainer || frontend_spin&.maintainer || spin_for_category(:backend).maintainer
             end
           when :ux
-            spin.optional_role = :maintainer
-
             # We want at least a UX reviewer who can review any wider community
             # contribution even without a team designer. We assign this to Pedro.
             spin.reviewer = ux_fallback_wider_community_reviewer if
@@ -74,7 +77,7 @@ module Gitlab
 
         spins
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       # Spin a reviewer for a particular approval rule
       #
@@ -92,12 +95,8 @@ module Gitlab
 
       private
 
-      attr_reader :random, :ux_fallback_wider_community_reviewer
-
-      # 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") })
-      end
+      attr_reader :random, :ux_fallback_wider_community_reviewer,
+        :codeowners_usernames, :codeowners_reviewer_boost, :codeowners_maintainer_boost
 
       def spin_for_category(category)
         reviewers, traintainers, maintainers =
@@ -105,8 +104,16 @@ module Gitlab
             spin_role_for_category(role, category)
           end
 
-        weighted_reviewers = Weightage::Reviewers.new(reviewers, traintainers).execute
-        weighted_maintainers = Weightage::Maintainers.new(maintainers).execute
+        weighted_reviewers = Weightage::Reviewers.new(
+          reviewers, traintainers,
+          codeowners_usernames: codeowners_usernames,
+          codeowners_boost: codeowners_reviewer_boost
+        ).execute
+        weighted_maintainers = Weightage::Maintainers.new(
+          maintainers,
+          codeowners_usernames: codeowners_usernames,
+          codeowners_boost: codeowners_maintainer_boost
+        ).execute
 
         reviewer = spin_for_person(weighted_reviewers)
         maintainer = spin_for_person(weighted_maintainers)

data/lib/gitlab/dangerfiles/title_linting.rb

@@ -3,7 +3,10 @@
 module Gitlab
   module Dangerfiles
     module TitleLinting
-      DRAFT_REGEX = /\A*#{Regexp.union(/(?i)(\[WIP\]\s*|WIP:\s*|WIP$)/, /(?i)(\[draft\]|\(draft\)|draft:|draft\s\-\s|draft$)/)}+\s*/i.freeze
+      # Matches the markers a title starts with, one or several in a row, and
+      # a WIP or draft it ends with. The same markers anywhere else in a title
+      # are part of its text.
+      DRAFT_REGEX = /\A(?:(?:\[WIP\]|WIP:|\[draft\]|\(draft\)|draft:|draft\s-\s)\s*)+|(?:WIP|draft)\z/i.freeze
       CHERRY_PICK_REGEX = /cherry[\s-]*pick/i.freeze
       RUN_ALL_RSPEC_REGEX = /RUN ALL RSPEC/i.freeze
       RUN_AS_IF_FOSS_REGEX = /RUN AS-IF-FOSS/i.freeze

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "4.12.0"
+    VERSION = "4.14.0"
   end
 end

data/lib/gitlab/dangerfiles/weightage/maintainers.rb

@@ -7,8 +7,13 @@ module Gitlab
     module Weightage
       # @api private
       class Maintainers
-        def initialize(maintainers)
+        # @param maintainers [Array<Gitlab::Dangerfiles::Teammate>]
+        # @param codeowners_usernames [Set<String>] usernames of CODEOWNERS-eligible approvers for the MR
+        # @param codeowners_boost [Integer] extra weight entries for CODEOWNERS-eligible maintainers
+        def initialize(maintainers, codeowners_usernames: Set.new, codeowners_boost: 0)
           @maintainers = maintainers
+          @codeowners_usernames = codeowners_usernames
+          @codeowners_boost = codeowners_boost
         end
 
         def execute
@@ -19,7 +24,7 @@ module Gitlab
 
         private
 
-        attr_reader :maintainers
+        attr_reader :maintainers, :codeowners_usernames, :codeowners_boost
 
         def add_weighted_reviewer(reviewers, reviewer, weight)
           if reviewer.reduced_capacity
@@ -27,6 +32,8 @@ module Gitlab
           else
             reviewers.fill(reviewer, reviewers.size, weight * Gitlab::Dangerfiles::Weightage::CAPACITY_MULTIPLIER)
           end
+
+          reviewers.fill(reviewer, reviewers.size, codeowners_boost) if codeowners_boost.positive? && codeowners_usernames.include?(reviewer.username)
         end
       end
     end

data/lib/gitlab/dangerfiles/weightage/reviewers.rb

@@ -18,20 +18,27 @@ module Gitlab
       # | hungry traintainer           |                              6 |
       # +------------------------------+--------------------------------+
       #
+      # When +codeowners_boost+ is configured (> 0), reviewers whose
+      # username appears in +codeowners_usernames+ receive that many
+      # additional entries in the pool on top of their base weight.
+      #
       # @api private
       class Reviewers
         DEFAULT_REVIEWER_WEIGHT = Gitlab::Dangerfiles::Weightage::CAPACITY_MULTIPLIER * Gitlab::Dangerfiles::Weightage::BASE_REVIEWER_WEIGHT
         TRAINTAINER_WEIGHT = 2
 
-        def initialize(reviewers, traintainers)
+        # @param reviewers [Array<Gitlab::Dangerfiles::Teammate>]
+        # @param traintainers [Array<Gitlab::Dangerfiles::Teammate>]
+        # @param codeowners_usernames [Set<String>] usernames of CODEOWNERS-eligible approvers for the MR
+        # @param codeowners_boost [Integer] extra weight entries for CODEOWNERS-eligible reviewers
+        def initialize(reviewers, traintainers, codeowners_usernames: Set.new, codeowners_boost: 0)
           @reviewers = reviewers
           @traintainers = traintainers
+          @codeowners_usernames = codeowners_usernames
+          @codeowners_boost = codeowners_boost
         end
 
         def execute
-          # TODO: take CODEOWNERS into account?
-          # https://gitlab.com/gitlab-org/gitlab/issues/26723
-
           remove_traintainers_from_reviewers!
           remove_maintainer_only_from_reviewers!
 
@@ -40,7 +47,7 @@ module Gitlab
 
         private
 
-        attr_reader :reviewers, :traintainers
+        attr_reader :reviewers, :traintainers, :codeowners_usernames, :codeowners_boost
 
         def remove_traintainers_from_reviewers!
           # Sometimes folks will add themselves as traintainers and not remove themselves as reviewers.
@@ -75,6 +82,8 @@ module Gitlab
           else
             reviewers.fill(reviewer, reviewers.size, DEFAULT_REVIEWER_WEIGHT)
           end
+
+          reviewers.fill(reviewer, reviewers.size, codeowners_boost) if codeowners_boost.positive? && codeowners_usernames.include?(reviewer.username)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.14.0
 platform: ruby
 authors:
 - GitLab
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-15 00:00:00.000000000 Z
+date: 2026-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -241,14 +241,12 @@ files:
 - 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
 - lib/danger/rules/changelog/Dangerfile
 - lib/danger/rules/changes_size/Dangerfile
 - lib/danger/rules/commit_messages/Dangerfile
 - lib/danger/rules/commits_counter/Dangerfile
-- lib/danger/rules/duo_code_review/Dangerfile
 - lib/danger/rules/metadata/Dangerfile
 - lib/danger/rules/simple_roulette/Dangerfile
 - lib/danger/rules/type_label/Dangerfile

data/lib/danger/plugins/duo_code.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Danger
-  # Contains method to check if Duo code suggestion added to MR as a reviewer.
-  class DuoCode < Danger::Plugin
-    def suggestion_added?
-      return false unless helper.ci?
-
-      helper.mr_reviewers.include?("GitLabDuo")
-    end
-  end
-end

data/lib/danger/rules/duo_code_review/Dangerfile

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-return if duo_code.suggestion_added?
-
-case helper.config.duo_code_review
-when :optional
-  markdown("We advise getting a review from GitLab Duo Code. You can assign `@GitLabDuo` as a reviewer to this merge request.")
-when :mandatory
-  failure("A review from GitLab Duo Code is mandatory. Please assign `@GitLabDuo` as a reviewer to this merge request.")
-end