gitlab-dangerfiles 3.13.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fae45cdf2a0c840f86b2d1864e521587210e4f365d2d03727be0d73866e4379c
-  data.tar.gz: a8380520fe8d4d12be578493244570265023db9f850ff374cd879591fb533b02
+  metadata.gz: c7a2df8349c1deecf91c154f6d8a8fa3e011217b00edb9078a12ae29e04891e9
+  data.tar.gz: 1df827117d0e4012436e5b77e19daa1ee36855e5085581baa29a8e36f4fbd04f
 SHA512:
-  metadata.gz: 178104293164685aa9b265505785872372ad621b92b15fca37a590be070e7abbfd4090c339f3869c1c9e4da56281800b479c96c6992fb141e358320944e508ab
-  data.tar.gz: bb6f9c2b409a904517d7f8e91918ddc7df959de37b41a25cd898398749d227e5b40755669a406e3bd8063df255f8639d5fccdef37c2cd150cad31e6c3d036f11
+  metadata.gz: f0f4c1dd6bc142deaa101e4b47b362cfab5955b0d4fa4fd13f495bd9f7ce10f9452c1ed050e452aeb808440ba520b18d67533e52e93efd748e8bfd0a8d9c00c1
+  data.tar.gz: 17a595ead4bffa6416632543196f0b4b1f1141ab69f22144a9996f1db0dc76be6a39f3781794fd418333752e6e094042533841b9ea760e6f721c525f868ccf5f

data/.gitlab-ci.yml

@@ -57,7 +57,6 @@ test:rufo:
 
 include:
   - template: Security/Dependency-Scanning.gitlab-ci.yml
-  - template: Security/License-Scanning.gitlab-ci.yml
   - template: Security/SAST.gitlab-ci.yml
   - template: Security/Secret-Detection.gitlab-ci.yml
   - project: 'gitlab-org/quality/pipeline-common'
@@ -78,11 +77,6 @@ gemnasium-dependency_scanning:
     - if: '$CI_MERGE_REQUEST_IID'
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
 
-license_scanning:
-  rules:
-    - if: '$CI_MERGE_REQUEST_IID'
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-
 secret_detection:
   rules:
     - if: '$CI_MERGE_REQUEST_IID'

data/.rubocop_todo.yml

@@ -126,11 +126,6 @@ Lint/IdentityComparison:
     - 'spec/gitlab/dangerfiles/weightage/maintainers_spec.rb'
     - 'spec/gitlab/dangerfiles/weightage/reviewers_spec.rb'
 
-# Offense count: 1
-Lint/NonLocalExitFromIterator:
-  Exclude:
-    - 'lib/danger/rules/subtype_label/Dangerfile'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Lint/RedundantCopDisableDirective:
@@ -310,7 +305,6 @@ Style/FrozenStringLiteralComment:
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Exclude:
-    - 'lib/danger/rules/subtype_label/Dangerfile'
     - 'lib/danger/rules/type_label/Dangerfile'
 
 # Offense count: 2
@@ -384,7 +378,6 @@ Style/PercentLiteralDelimiters:
     - 'Guardfile'
     - 'gitlab-dangerfiles.gemspec'
     - 'lib/danger/plugins/internal/helper.rb'
-    - 'lib/danger/rules/subtype_label/Dangerfile'
     - 'lib/gitlab/dangerfiles/tasks/main.rake'
     - 'spec/danger/plugins/internal/helper_spec.rb'
 
@@ -471,7 +464,6 @@ Style/SelectByRegexp:
 # SupportedStyles: only_raise, only_fail, semantic
 Style/SignalException:
   Exclude:
-    - 'lib/danger/rules/subtype_label/Dangerfile'
     - 'lib/danger/rules/type_label/Dangerfile'
 
 # Offense count: 7

data/README.md

@@ -148,19 +148,9 @@ project. To use it in your project, perform the following steps:
    end
    ```
 
-#### `subtype_label`
-
-This rule warns when the merge request is missing a [subtype label](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification).
-
-If the `DANGER_ERROR_WHEN_SUBTYPE_LABEL_IS_MISSING` environment variable evaluates to `true`, Danger will error instead of warning when a subtype label is missing.
-
 #### `type_label`
 
-This rule warns when the merge request is missing a [type label](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification).
-
-If the `DANGER_ERROR_WHEN_TYPE_LABEL_IS_MISSING` environment variable evaluates to `true`, Danger will error instead of warning when a type label is missing.
-
-If the `changelog` plugin is available, it also tries to infer a type label from the `Changelog` trailer of the MR.
+If the `changelog` plugin is available, it tries to infer a type label from the `Changelog` trailer of the MR.
 
 #### `z_add_labels`
 

data/gitlab-dangerfiles.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rake", ">= 0"
   spec.add_dependency "danger-gitlab", ">= 8.0.0"
-  spec.add_dependency "danger", ">= 8.4.5"
+  spec.add_dependency "danger", ">= 9.3.0"
 
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-parameterized"

data/lib/danger/plugins/changelog.rb

@@ -24,9 +24,7 @@ module Danger
     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.",
       ci: <<~MSG,
-        If you want to create a changelog entry for GitLab FOSS, add the `Changelog` trailer to the commit message you want to add to the changelog.
-
-        If you want to create a changelog entry for GitLab EE, also [add the `EE: true` trailer](https://docs.gitlab.com/ee/development/changelog.html#gitlab-enterprise-changes) to your commit message.
+        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.
       MSG

data/lib/danger/plugins/roulette.rb

@@ -280,6 +280,12 @@ module Danger
       reviewer = spin_for_person(weighted_reviewers)
       maintainer = spin_for_person(weighted_maintainers)
 
+      # allow projects with small number of reviewers to take from maintainers if possible
+      if reviewer.nil? && weighted_maintainers.uniq.size > 1
+        weighted_maintainers.delete(maintainer)
+        reviewer = spin_for_person(weighted_maintainers)
+      end
+
       Spin.new(category, reviewer, maintainer, false)
     end
 

data/lib/danger/rules/type_label/Dangerfile

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-TYPE_LABEL_MISSING_MESSAGE = "Please add a [merge request type](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification) to this merge request."
-
 require_relative "../../../gitlab/dangerfiles/type_label_guesser"
 
 return if helper.has_scoped_label_with_scope?("type")
@@ -10,9 +8,3 @@ if respond_to?(:changelog)
   type_label_guesser = Gitlab::Dangerfiles::TypeLabelGuesser.new
   helper.labels_to_add.concat(type_label_guesser.labels_from_changelog_categories(changelog.categories))
 end
-
-if ENV['DANGER_ERROR_WHEN_TYPE_LABEL_IS_MISSING'] == 'true'
-  fail TYPE_LABEL_MISSING_MESSAGE
-else
-  warn TYPE_LABEL_MISSING_MESSAGE
-end

data/lib/gitlab/dangerfiles/type_label_guesser.rb

@@ -8,8 +8,8 @@ module Gitlab
         security: %w[type::bug bug::vulnerability],
         performance: %w[type::bug bug::performance],
         added: %w[type::feature feature::addition],
-        deprecated: %w[type::feature feature::removal],
-        removed: %w[type::feature feature::removal],
+        deprecated: %w[type::maintenance maintenance::removal],
+        removed: %w[type::maintenance maintenance::removal],
       }.freeze
 
       def labels_from_changelog_categories(categories)

data/lib/gitlab/dangerfiles/version.rb

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

data/lib/gitlab/dangerfiles.rb

@@ -8,7 +8,6 @@ module Gitlab
       metadata
       simple_roulette
       type_label
-      subtype_label
       z_add_labels
       z_retry_link
     ].freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 4.1.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-02 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.4.5
+        version: 9.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.4.5
+        version: 9.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,6 @@ files:
 - lib/danger/rules/commits_counter/Dangerfile
 - lib/danger/rules/metadata/Dangerfile
 - lib/danger/rules/simple_roulette/Dangerfile
-- lib/danger/rules/subtype_label/Dangerfile
 - lib/danger/rules/type_label/Dangerfile
 - lib/danger/rules/z_add_labels/Dangerfile
 - lib/danger/rules/z_retry_link/Dangerfile

data/lib/danger/rules/subtype_label/Dangerfile

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-SUBTYPE_LABEL_MISSING_MESSAGE = "Please add a [merge request subtype](https://about.gitlab.com/handbook/engineering/metrics/#work-type-classification) to this merge request."
-
-types = %w(bug feature maintenance)
-types.each do |type|
-  return if helper.has_scoped_label_with_scope?(type)
-end
-
-if ENV['DANGER_ERROR_WHEN_SUBTYPE_LABEL_IS_MISSING'] == 'true'
-  fail SUBTYPE_LABEL_MISSING_MESSAGE
-else
-  warn SUBTYPE_LABEL_MISSING_MESSAGE
-end