diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /app/graphql/resolvers/projects/jira_projects_resolver.rb | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'app/graphql/resolvers/projects/jira_projects_resolver.rb')
-rw-r--r-- | app/graphql/resolvers/projects/jira_projects_resolver.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/graphql/resolvers/projects/jira_projects_resolver.rb b/app/graphql/resolvers/projects/jira_projects_resolver.rb index ed382ac82d0..d017f973e17 100644 --- a/app/graphql/resolvers/projects/jira_projects_resolver.rb +++ b/app/graphql/resolvers/projects/jira_projects_resolver.rb @@ -22,7 +22,7 @@ module Resolvers projects_array, # override default max_page_size to whatever the size of the response is, # see https://gitlab.com/gitlab-org/gitlab/-/issues/231394 - args.merge({ max_page_size: projects_array.size }) + **args.merge({ max_page_size: projects_array.size }) ) else raise Gitlab::Graphql::Errors::BaseError, response.message |