diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/graphql/resolvers/merge_requests_resolver.rb | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/graphql/resolvers/merge_requests_resolver.rb')
| -rw-r--r-- | app/graphql/resolvers/merge_requests_resolver.rb | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/app/graphql/resolvers/merge_requests_resolver.rb b/app/graphql/resolvers/merge_requests_resolver.rb index d15a1ede6fe..677f84e5795 100644 --- a/app/graphql/resolvers/merge_requests_resolver.rb +++ b/app/graphql/resolvers/merge_requests_resolver.rb @@ -29,11 +29,18 @@ module Resolvers as: :label_name, description: 'Array of label names. All resolved merge requests will have all of these labels.' argument :merged_after, Types::TimeType, - required: false, - description: 'Merge requests merged after this date' + required: false, + description: 'Merge requests merged after this date' argument :merged_before, Types::TimeType, - required: false, - description: 'Merge requests merged before this date' + required: false, + description: 'Merge requests merged before this date' + argument :milestone_title, GraphQL::STRING_TYPE, + required: false, + description: 'Title of the milestone' + argument :sort, Types::MergeRequestSortEnum, + description: 'Sort merge requests by this criteria', + required: false, + default_value: 'created_desc' def self.single ::Resolvers::MergeRequestResolver |