diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-10 20:41:25 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-10 20:41:41 +0000 |
commit | ceaba594d07563402ac901c958b9a6e27c4964dc (patch) | |
tree | f1a9106b80fe8b932ed73938032957c51e151c6c | |
parent | 14d2af20ed388dc30da7cc103584b0229e0edb62 (diff) | |
download | gitlab-ce-ceaba594d07563402ac901c958b9a6e27c4964dc.tar.gz |
Add latest changes from gitlab-org/security/gitlab@14-6-stable-ee
-rw-r--r-- | app/graphql/resolvers/base_issues_resolver.rb | 2 | ||||
-rw-r--r-- | spec/graphql/resolvers/issues_resolver_spec.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/graphql/resolvers/base_issues_resolver.rb b/app/graphql/resolvers/base_issues_resolver.rb index dca93444907..3983a3697cb 100644 --- a/app/graphql/resolvers/base_issues_resolver.rb +++ b/app/graphql/resolvers/base_issues_resolver.rb @@ -36,7 +36,7 @@ module Resolvers def unconditional_includes [ { - project: [:project_feature] + project: [:project_feature, :group] }, :author ] diff --git a/spec/graphql/resolvers/issues_resolver_spec.rb b/spec/graphql/resolvers/issues_resolver_spec.rb index 3c892214aaf..dc717b113c1 100644 --- a/spec/graphql/resolvers/issues_resolver_spec.rb +++ b/spec/graphql/resolvers/issues_resolver_spec.rb @@ -560,13 +560,13 @@ RSpec.describe Resolvers::IssuesResolver do end it 'finds a specific issue with iid', :request_store do - result = batch_sync(max_queries: 5) { resolve_issues(iid: issue1.iid).to_a } + result = batch_sync(max_queries: 6) { resolve_issues(iid: issue1.iid).to_a } expect(result).to contain_exactly(issue1) end it 'batches queries that only include IIDs', :request_store do - result = batch_sync(max_queries: 5) do + result = batch_sync(max_queries: 6) do [issue1, issue2] .map { |issue| resolve_issues(iid: issue.iid.to_s) } .flat_map(&:to_a) @@ -576,7 +576,7 @@ RSpec.describe Resolvers::IssuesResolver do end it 'finds a specific issue with iids', :request_store do - result = batch_sync(max_queries: 5) do + result = batch_sync(max_queries: 6) do resolve_issues(iids: [issue1.iid]).to_a end |