From 6867eff1f997a881cd3ea64109f7ba2d4b42fde4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 7 Apr 2020 21:09:46 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/finders/projects_finder.rb | 4 ++-- app/graphql/resolvers/merge_requests_resolver.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb index 2c3611875a2..23648e0f494 100644 --- a/app/finders/projects_finder.rb +++ b/app/finders/projects_finder.rb @@ -142,8 +142,8 @@ class ProjectsFinder < UnionFinder # rubocop: disable CodeReuse/ActiveRecord def by_ids(items) items = items.where(id: project_ids_relation) if project_ids_relation - items = items.where('id > ?', params[:id_after]) if params[:id_after] - items = items.where('id < ?', params[:id_before]) if params[:id_before] + items = items.where('projects.id > ?', params[:id_after]) if params[:id_after] + items = items.where('projects.id < ?', params[:id_before]) if params[:id_before] items end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/graphql/resolvers/merge_requests_resolver.rb b/app/graphql/resolvers/merge_requests_resolver.rb index 406a1fac05c..cda27890d6b 100644 --- a/app/graphql/resolvers/merge_requests_resolver.rb +++ b/app/graphql/resolvers/merge_requests_resolver.rb @@ -4,11 +4,11 @@ module Resolvers class MergeRequestsResolver < BaseResolver argument :iid, GraphQL::STRING_TYPE, required: false, - description: 'The IID of the merge request, e.g., "1"' + description: 'IID of the merge request, for example `1`' argument :iids, [GraphQL::STRING_TYPE], required: false, - description: 'The list of IIDs of issues, e.g., [1, 2]' + description: 'Array of IIDs of merge requests, for example `[1, 2]`' type Types::MergeRequestType, null: true -- cgit v1.2.1