gitlab-dangerfiles 3.12.0 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edf969f524278d280762935cb8a04c78a22180296c3b7e88deb342ab8f83c840
-  data.tar.gz: 6b3b3c493beb17172786cefaa6e6ac1dd1ef243234b5e90e632b79830a7fae9c
+  metadata.gz: fae45cdf2a0c840f86b2d1864e521587210e4f365d2d03727be0d73866e4379c
+  data.tar.gz: a8380520fe8d4d12be578493244570265023db9f850ff374cd879591fb533b02
 SHA512:
-  metadata.gz: 56e849f993eec188646a8f06106855409146070234b158c8cd48abe0378008c9d1c957dafbb1af6dbee4f86744014d1a852bc426993337f8b9978b9e7cdcdd80
-  data.tar.gz: 19f31baf98812c924fc62d88cdc601f0f73a0c9e0c239647e25d6e79c6a1a4eaec831397658883b9cc9aff70e0fabee8e3f4df0908f119c0262788296097793e
+  metadata.gz: 178104293164685aa9b265505785872372ad621b92b15fca37a590be070e7abbfd4090c339f3869c1c9e4da56281800b479c96c6992fb141e358320944e508ab
+  data.tar.gz: bb6f9c2b409a904517d7f8e91918ddc7df959de37b41a25cd898398749d227e5b40755669a406e3bd8063df255f8639d5fccdef37c2cd150cad31e6c3d036f11

data/.rubocop.yml

@@ -20,7 +20,7 @@ Layout/LineLength:
   Enabled: false
 
 RSpec/MultipleMemoizedHelpers:
-  Max: 30
+  Max: 35
 
 RSpec/FilePath:
   Enabled: false

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

@@ -478,6 +478,7 @@ module Danger
 
     def current_milestone
       @current_milestone ||= gitlab_helper.api.group_milestones(GITLAB_ORG_GROUP_ID, state: "active")
+        .auto_paginate
         .select { |m| m.title.match?(/\A\d+\.\d+\z/) && !m.expired && m.start_date && m.due_date }
         .min_by(&:start_date)
     end

data/lib/danger/plugins/roulette.rb

@@ -49,14 +49,6 @@ module Danger
       categories
     end
 
-    def assign_pedroms_for_ux_wider_community_contribution(spins)
-      # We want at least a UX reviewer who can review any wider community
-      # contribution even without a team designer. We assign this to Pedro.
-      ux_spin = look_for_fallback_designer_for_ux_wider_community_contribution?(spins)
-
-      ux_spin && ux_spin.reviewer = teammate_pedroms
-    end
-
     # Finds the +Gitlab::Dangerfiles::Teammate+ object whose username matches the MR author username.
     #
     # @return [Gitlab::Dangerfiles::Teammate]
@@ -72,7 +64,7 @@ module Danger
     #
     # @return [Array<Spin>]
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-    def spin(project = nil, categories = [:none])
+    def spin(project = nil, categories = [:none], ux_fallback_wider_community_reviewer: teammate_pedroms)
       project = (project || config_project_name).downcase
       categories = categories.map { |category| category&.downcase || :none }
       categories.reject! { |category| import_and_integrate_reject_category?(category, project) }
@@ -120,6 +112,13 @@ module Danger
           spin.optional_role = :maintainer
         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
+            labels.include?("Community contribution") &&
+            spin.reviewer.nil? &&
+            spin.maintainer.nil?
         end
       end
 
@@ -285,7 +284,6 @@ module Danger
     end
 
     def prepare_ux_category!(categories)
-      # Ensure to spin for UX reviewer when ~UX is applied (e.g. to review changes to the UI)
       if labels.include?("Community contribution")
         categories << :ux
       else
@@ -297,7 +295,9 @@ module Danger
           # there's no designer for this team.
           labels << "Community contribution"
 
-          ux_spin = spin(nil, [:ux]).first
+          # Don't use a fallback reviewer so when a group doesn't have
+          # available reviewers, it'll not give us any reviewers.
+          ux_spin = spin(nil, [:ux], ux_fallback_wider_community_reviewer: nil).first
 
           categories << :ux if ux_spin.reviewer || ux_spin.maintainer
         ensure
@@ -307,15 +307,6 @@ module Danger
       end
     end
 
-    def look_for_fallback_designer_for_ux_wider_community_contribution?(spins)
-      labels.include?("Community contribution") &&
-        spins.find do |spin|
-          spin.category == :ux &&
-            spin.reviewer.nil? &&
-            spin.maintainer.nil?
-        end
-    end
-
     # Fetches the given +url+ and parse its response as JSON.
     #
     # @param [String] url

data/lib/danger/rules/simple_roulette/Dangerfile

@@ -87,10 +87,6 @@ if changes.any?
   show_category_column = categories.size > 1 || categories.first != :none
   random_roulette_spins = roulette.spin(nil, categories)
 
-  if categories.include?(:ux)
-    roulette.assign_pedroms_for_ux_wider_community_contribution(random_roulette_spins)
-  end
-
   rows = random_roulette_spins.map do |spin|
     markdown_row_for_spins(spin.category, [spin], show_category_column: show_category_column)
   end

data/lib/gitlab/dangerfiles/category.rb

@@ -78,27 +78,19 @@ module Gitlab
           super &&
 
             if labels.any?("Community contribution")
-              can_review_wider_community_contribution?(teammate)
+              # We want the designer for the team to review the wider community
+              # contribution because they're more familiar with that area.
+              the_designer_for_the_team?(teammate)
             else
-              can_review_team_memeber_contribution?(teammate)
+              # We don't want the designer for the team to review merge
+              # requests for the same team which is designed by themselves.
+              # So they can only review if they're not the designer for the team.
+              !the_designer_for_the_team?(teammate)
             end
         end
 
         private
 
-        def can_review_wider_community_contribution?(teammate)
-          # We want the designer for the team to review the wider community
-          # contribution because they're more familiar with that area.
-          the_designer_for_the_team?(teammate)
-        end
-
-        def can_review_team_memeber_contribution?(teammate)
-          # We don't want the designer for the team to review merge
-          # requests for the same team which is designed by themselves.
-          # So they can only review if they're not the designer for the team.
-          !the_designer_for_the_team?(teammate)
-        end
-
         def the_designer_for_the_team?(teammate)
           # Pick corresponding group for community contribution
           # Specialty can be:

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "3.12.0"
+    VERSION = "3.13.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.13.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake