gitlab-dangerfiles 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d29ef356c65c4a2ceec87eccbe6d723ee26ae1175176b788d13c146b508ec9fb
-  data.tar.gz: fd15845d7c87873c15a8f144fa1bbca3801f0f45dc8e7363585110df07cbb11e
+  metadata.gz: 725c7feec8f29334e0ead741012d5b8d375cd026659853b78647c6508dcc6036
+  data.tar.gz: 1fc53d98126dee2a149b2ed57261b4652735729da94443371adc1c632a1d7217
 SHA512:
-  metadata.gz: e14eb3849ed8da68ac7a716347ff89b4a2df7fbd47b014663807c913632fa6f6d363de94b94aa2df868335e6e5d5af0362f477c07b5d3519b5bd46219623150f
-  data.tar.gz: 6f233f7f4b679dcca8ab438f54fd0ff4a400e8527614d675562421b818ad1dfe505874259cfc7e718dbba665c6dde02551520168b71630b39ad2680949db2b1c
+  metadata.gz: 60608ce5de5def782566653bfaeb9e036f95ff36d0a9a1fc57a7cbff663a8ca83b7769bc47751ec3a1dcb26ab7daf82ba39274753bf928d0f55708e2cfd65fec
+  data.tar.gz: 88eaaa34e4594faea4972fb762b1f8ba609a073b6a9940a3bd77ca350022535d3ddb2d20997c87c5283af5f85245e50af56ed744897f304cfed66c575ab95944

data/lib/danger/plugins/roulette.rb

@@ -43,7 +43,7 @@ module Danger
     #
     # @return [Array<Spin>]
     def spin(project = nil, categories = [nil], timezone_experiment: false)
-      project = (project || helper.config.project_name).downcase
+      project = (project || config_project_name).downcase
       categories = categories.map { |category| category&.downcase }
       categories.reject! { |category| integrations_reject_category?(category, project) }
 
@@ -187,11 +187,8 @@ module Danger
     #
     # @return [Gitlab::Dangerfiles::Teammate]
     def spin_for_approver(rule)
-      # This will filter out approvers who are not even reviewers who
-      # don't show up in roulette data we're relying on.
-      # That's why `filter_map` is used.
       approvers = rule["eligible_approvers"].filter_map do |approver|
-        find_member(approver["username"])
+        find_member(approver["username"], project: config_project_name.downcase)
       end
 
       spin_for_person(approvers) || spin_for_approver_fallback(rule)
@@ -269,8 +266,22 @@ module Danger
         end
     end
 
-    def find_member(username)
-      company_members.find { |person| person.username == username }
+    def find_member(username, project: nil)
+      company_members.find do |member|
+        member.username == username &&
+          if project
+            member.in_project?(project)
+          else
+            true
+          end
+      end
+    end
+
+    # Return the configured project name
+    #
+    # @return [String]
+    def config_project_name
+      helper.config.project_name
     end
 
     # Like +team+, but only returns teammates in the current project, based on

data/lib/danger/rules/commit_messages/Dangerfile

@@ -54,7 +54,7 @@ def lint_commit(commit)
   return linter if linter.fixup? && helper.squash_mr?
 
   if linter.fixup?
-    msg = "Squash or fixup commits must be squashed before merge, or enable squash merge option and re-run #{danger_job_link}."
+    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
@@ -68,7 +68,7 @@ def lint_commit(commit)
   # 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, enable squash in the merge request and re-run #{danger_job_link}.", more_info: false)
+      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

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "3.5.0"
+    VERSION = "3.5.1"
   end
 end

metadata

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