gitlab-triage 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 817c2b22f9f62ba6ec09e4441aea29dd4f7ae639bd8b49888236ff11a27e33a9
-  data.tar.gz: fbd6f4fff1adc6e99e271d438fe7ced46cc40db7a83c59ae985a156d9f57a414
+  metadata.gz: fbce3d75b063c517b80bbbfa5a0cf8ef2cf0f6ffe9eabcebe743f7ea5e6fbc23
+  data.tar.gz: '09687c2d578d80f351a54a614113bcf36b70a15144f848409b8143be53c95f9b'
 SHA512:
-  metadata.gz: bab557c9169e861a96fce7b471080194943da6753541860ec3bb01d8790b43bc1c604a59d8fa3e73a0e4dd8dac735dec98746ff2e8a6c97d78d3ee7d87681fa1
-  data.tar.gz: 76a6ce14b74488879f14ca43bb0dcbd1b8d2f22e55d1ce7ee7b4cca5efd42715f462eac219c9f5f40de2a81060aa0c4e58e87db8dd3f1e90788a74c1c61b8f2c
+  metadata.gz: f88d9507fd36e15941fa9b1345887e138893e8e7e5ae1b872408cfea449c2565c48c4267c1df278fa0f1ddf3f1c857050e4868eef88268b4acf9c7078dda0a53
+  data.tar.gz: 77dfd58b8e61d3115e9057b688d7f2b91b8473dd4e7a177a32cad0585f1f42c115d371f9d10f10a0a27fd3ee1b4230ee757982dcc85207395ebef82274165e70

data/.gitlab/CODEOWNERS

@@ -1,2 +1,2 @@
 # The official maintainers
-* @rymai @godfat @markglenfletcher
+* @rymai @godfat-gitlab @markglenfletcher

data/lib/gitlab/triage/engine.rb

@@ -174,8 +174,10 @@ module Gitlab
           # retrieving the resources for every rule is inefficient
           # however, previous rules may affect those upcoming
           resources = network.query_api(build_get_url(resource_type, conditions))
+          iids = resources.pluck('iid').map(&:to_s)
+
           graphql_query = build_graphql_query(resource_type, conditions)
-          graphql_resources = graphql_network.query(graphql_query, source: options.source_id) if graphql_query.present?
+          graphql_resources = graphql_network.query(graphql_query, source: options.source_id, iids: iids) if graphql_query.present?
           # In some filters/actions we want to know which resource type it is
           attach_resource_type(resources, resource_type)
           decorate_resources_with_graphql_data(resources, graphql_resources)

data/lib/gitlab/triage/graphql_queries/query_builder.rb

@@ -18,7 +18,7 @@ module Gitlab
         def query
           return if query_template.nil?
 
-          format(query_template, source_type: source_type, resource_type: resource_type.to_s.camelize(:lower))
+          format(query_template, source_type: source_type, resource_type: resource_type.to_s.camelize(:lower), group_query: group_query)
         end
 
         delegate :present?, to: :query_template
@@ -35,6 +35,12 @@ module Gitlab
             ThreadsQuery
           end
         end
+
+        def group_query
+          return if source_type != 'group'
+
+          ', includeSubgroups: true'
+        end
       end
     end
   end

data/lib/gitlab/triage/graphql_queries/threads_query.rb

@@ -2,10 +2,10 @@ module Gitlab
   module Triage
     module GraphqlQueries
       ThreadsQuery = <<-GRAPHQL.freeze # rubocop:disable Naming/ConstantName
-        query($source: ID!, $after: String) {
+        query($source: ID!, $after: String, $iids: [String!]) {
           %{source_type}(fullPath: $source) {
             id
-            %{resource_type}(after: $after) {
+            %{resource_type}(after: $after, iids: $iids%{group_query}) {
               pageInfo {
                 hasNextPage
                 endCursor

data/lib/gitlab/triage/graphql_queries/user_notes_query.rb

@@ -2,10 +2,10 @@ module Gitlab
   module Triage
     module GraphqlQueries
       UserNotesQuery = <<-GRAPHQL.freeze # rubocop:disable Naming/ConstantName
-        query($source: ID!, $after: String) {
+        query($source: ID!, $after: String, $iids: [String!]) {
           %{source_type}(fullPath: $source) {
             id
-            %{resource_type}(after: $after) {
+            %{resource_type}(after: $after, iids: $iids%{group_query}) {
               pageInfo {
                 hasNextPage
                 endCursor

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.14.0'
+    VERSION = '1.14.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-26 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport