diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-29 05:40:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-29 05:40:49 +0300 |
commit | 096459e2c2c8e3c17eb6e677091990adffe9af7d (patch) | |
tree | 9f44c72618d2559c131aa31f3d293b2dbd1a8d3c /app | |
parent | a082c45f16bf30bef6e82defa75901375287d467 (diff) |
Add latest changes from gitlab-org/gitlab@15-10-stable-ee
Diffstat (limited to 'app')
-rw-r--r-- | app/graphql/resolvers/issues_resolver.rb | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/app/graphql/resolvers/issues_resolver.rb b/app/graphql/resolvers/issues_resolver.rb index bbf45efa33e..17e3e159a5b 100644 --- a/app/graphql/resolvers/issues_resolver.rb +++ b/app/graphql/resolvers/issues_resolver.rb @@ -2,14 +2,19 @@ module Resolvers class IssuesResolver < Issues::BaseResolver + extend ::Gitlab::Utils::Override prepend ::Issues::LookAheadPreloads include ::Issues::SortArguments - NON_FILTER_ARGUMENTS = %i[sort lookahead].freeze + NON_FILTER_ARGUMENTS = %i[sort lookahead include_archived].freeze + argument :include_archived, GraphQL::Types::Boolean, + required: false, + default_value: false, + description: 'Whether to include issues from archived projects. Defaults to `false`.' argument :state, Types::IssuableStateEnum, - required: false, - description: 'Current state of this issue.' + required: false, + description: 'Current state of this issue.' # see app/graphql/types/issue_connection.rb type 'Types::IssueConnection', null: true @@ -44,6 +49,13 @@ module Resolvers private + override :prepare_finder_params + def prepare_finder_params(args) + super.tap do |prepared| + prepared[:non_archived] = !prepared.delete(:include_archived) + end + end + def filter_provided?(args) args.except(*NON_FILTER_ARGUMENTS).values.any?(&:present?) end |