gitlab-triage 1.21.0 → 1.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3390c4026f87e49c54807a88f711eaa87bce2e9e0093ca8c394b51f67986ccb4
-  data.tar.gz: 68a20611ec1d24730ca854985f77a991f85baba6dda5496619413b5dfdbdbc73
+  metadata.gz: 34fcebd4ec7d33597bb45cf4a48a9708143972b9d5c836f374f2cc629dc392a8
+  data.tar.gz: 48ed9e443369d98b3681d07bd83d81962a82fc5e5449c6c3198935f46a52e764
 SHA512:
-  metadata.gz: 9c435258d811e1c15c293924e609ebb75135a643f8020749f459206d11e37deb98ee4cc3e0fd365d74e0a6a547515af944f3e95b4b8f5887c82d49e5fc77b4c9
-  data.tar.gz: 21f85618ecdcf8d2f1e7b061f95682f1a29ce140553f1f5eb62f1baf121316bf6e84bd01d15fddf0b4bb4e789e70eb030f88cf36f5955d13c5b59033cee94f0d
+  metadata.gz: d32b0e581d1067771b25a1124d591e1e084c10e042a82d20e00ac4d00346e0f386c4c0962477db98d166dab2b0e893d82cbc171f7a5e81c398d2758c6839807d
+  data.tar.gz: 94b2712733c583bab7bc2a4f0c7d92155f9b454a257cd8461cecb1290b4e3aef77d758fadbba1b8720f95585372d2b1c4366ed38481d013f8c19a7ae52d19f44

data/.gitlab/issue_templates/Default.md

@@ -0,0 +1,11 @@
+Before raising an issue to the GitLab issue tracker, please read through our guide for finding help to determine the best place to post:
+
+* https://about.gitlab.com/getting-help/
+
+If you are experiencing an issue when using GitLab.com, your first port of call should be the Community Forum. Your issue may have already been reported there by another user. Please check:
+
+* https://forum.gitlab.com/
+
+If you feel that your issue can be categorized as a reproducible bug or a feature proposal, please use one of the issue templates provided and include as much information as possible.
+
+Thank you for helping to make GitLab a better product.

data/.gitlab/merge_request_templates/Default.md

@@ -0,0 +1,9 @@
+## What does this MR do and why?
+
+_Describe in detail what your merge request does and why._
+
+<!--
+Please keep this description updated with any discussion that takes place so
+that reviewers can understand your intent. Keeping the description updated is
+especially important if they didn't participate in the discussion.
+-->

data/Gemfile

@@ -10,6 +10,6 @@ group :test do
 end
 
 group :development, :test, :danger do
-  gem 'gitlab-dangerfiles', '~> 2.6.1', require: false
+  gem 'gitlab-dangerfiles', '~> 2.11.0', require: false
   gem 'guard-rspec', '~> 4.7.3', require: false
 end

data/README.md

@@ -153,6 +153,7 @@ Used to declare a condition that must be satisfied by a resource before actions
 Available condition types:
 - [`date` condition](#date-condition)
 - [`milestone` condition](#milestone-condition)
+- [`iteration` condition](#iteration-condition)
 - [`state` condition](#state-condition)
 - [`upvotes` condition](#upvotes-condition)
 - [`labels` condition](#labels-condition)
@@ -209,6 +210,25 @@ conditions:
   milestone: v1
 ```
 
+##### Iteration condition
+
+Accepts the name of an iteration to filter upon. Also accepts the following
+timebox values:
+
+- `none`
+- `any`
+
+See the [`iteration_id` API field documentation](https://docs.gitlab.com/ee/api/issues.html) for their meaning.
+
+Example:
+
+```yml
+conditions:
+  iteration: none
+```
+
+> **Note:** This query is not supported using GraphQL yet.
+
 ##### State condition
 
 Accepts a string.
@@ -1060,6 +1080,7 @@ Here's a list of currently available Ruby expression API:
 | ----                    | ----            | ----        |
 | resource                | Hash            | The hash containing the raw data of the resource. Note that `resource[:type]` is the type of the policy (`issues`, `merge_requests`, or `epics`), not the API `type` field. |
 | author                  | String          | The username of the resource author |
+| state                   | String          | The state of the resource |
 | milestone               | Milestone       | The milestone attached to the resource |
 | labels                  | [Label]         | A list of labels, having only names |
 | labels_with_details     | [Label]         | A list of labels which has more information loaded from another API request |
@@ -1069,6 +1090,14 @@ Here's a list of currently available Ruby expression API:
 | project_path            | String          | The path with namespace to the issues or merge requests project |
 | full_resource_reference | String          | A full reference including project path to the issue or merge request |
 
+##### Methods for `Issue` (issue context)
+
+| Name                   | Return type    | Description |
+| ----                   | ----           | ----        |
+| merge_requests_count   | Integer        | The number of merge requests related to the issue |
+| related_merge_requests | [MergeRequest] | The list of merge requests related to the issue |
+| closed_by              | [MergeRequest] | The list of merge requests that close the issue |
+
 ##### Methods for `MergeRequest` (merge request context)
 
 | Method              | Return type | Description |

data/gitlab-triage.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '~> 5.1'
+  spec.add_dependency 'activesupport', '>= 5.1'
   spec.add_dependency 'globalid', '~> 0.4'
   spec.add_dependency 'graphql-client', '~> 0.16'
   spec.add_dependency 'httparty', '~> 0.17'

data/lib/gitlab/triage/engine.rb

@@ -38,6 +38,7 @@ module Gitlab
         merge_requests: %w[opened closed merged]
       }.with_indifferent_access.freeze
       MILESTONE_TIMEBOX_VALUES = %w[none any upcoming started].freeze
+      ITERATION_SELECTION_VALUES = %w[none any].freeze
       EpicsTriagingForProjectImpossibleError = Class.new(StandardError)
 
       def initialize(policies:, options:, network_adapter_class: DEFAULT_NETWORK_ADAPTER, graphql_network_adapter_class: DEFAULT_GRAPHQL_ADAPTER)
@@ -428,7 +429,7 @@ module Gitlab
         # Issues API should use the `milestone_id` param for timebox values, and `milestone` for milestone title
         args =
           if resource_type.to_sym == :issues && MILESTONE_TIMEBOX_VALUES.include?(milestone_value.downcase)
-            ['milestone_id', milestone_value.downcase]
+            ['milestone_id', milestone_value.titleize] # The API only accepts titleized values.
           else
             ['milestone', milestone_value]
           end
@@ -436,9 +437,21 @@ module Gitlab
         APIQueryBuilders::SingleQueryParamBuilder.new(*args)
       end
 
+      def iteration_condition_builder(iteration_value)
+        # Issues API should use the `iteration_id` param for timebox values, and `iteration_title` for iteration title
+        args =
+          if ITERATION_SELECTION_VALUES.include?(iteration_value.downcase)
+            ['iteration_id', iteration_value.titleize] # The API only accepts titleized values.
+          else
+            ['iteration_title', iteration_value]
+          end
+        APIQueryBuilders::SingleQueryParamBuilder.new(*args)
+      end
+
       def issues_resource_query(conditions)
         [].tap do |condition_builders|
           condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('weight', conditions[:weight]) if conditions[:weight]
+          condition_builders << iteration_condition_builder(conditions[:iteration]) if conditions[:iteration]
         end
       end
 

data/lib/gitlab/triage/resource/issue.rb

@@ -8,6 +8,22 @@ module Gitlab
     module Resource
       class Issue < Base
         include Shared::Issuable
+
+        def merge_requests_count
+          @merge_requests_count ||= resource.dig(:merge_requests_count)
+        end
+
+        def related_merge_requests
+          @related_merge_requests ||= network.query_api_cached(
+            resource_url(sub_resource_type: 'related_merge_requests'))
+            .map { |merge_request| MergeRequest.new(merge_request, parent: self) }
+        end
+
+        def closed_by
+          @closed_by ||= network.query_api_cached(
+            resource_url(sub_resource_type: 'closed_by'))
+            .map { |merge_request| MergeRequest.new(merge_request, parent: self) }
+        end
       end
     end
   end

data/lib/gitlab/triage/resource/shared/issuable.rb

@@ -47,6 +47,10 @@ module Gitlab
             @labels_chronologically ||= labels_with_details.sort_by(&:added_at)
           end
 
+          def state
+            @state ||= resource.dig(:state)
+          end
+
           def author
             @author ||= resource.dig(:author, :username)
           end
@@ -65,7 +69,9 @@ module Gitlab
             max_levels: MAX_PARENT_LOOKUP)
             raise SourceTooDeep if max_levels <= 0
 
-            parent_id = resource.dig(:namespace, :parent_id)
+            # In projects, the reference to the namespace's parent ID is `namespace.parent_id`
+            # but in groups, the reference is directly in `parent_id`
+            parent_id = resource.dig(:namespace, :parent_id) || resource.dig(:parent_id)
 
             if parent_id
               root_id(

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.21.0'
+    VERSION = '1.23.1'
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.23.1
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
@@ -149,6 +149,8 @@ files:
 - ".gitlab-ci.yml"
 - ".gitlab/CODEOWNERS"
 - ".gitlab/changelog_config.yml"
+- ".gitlab/issue_templates/Default.md"
+- ".gitlab/merge_request_templates/Default.md"
 - ".gitlab/merge_request_templates/Release.md"
 - ".rubocop.yml"
 - ".ruby-version"