diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 15:07:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 15:07:47 +0000 |
| commit | 6f2065c468b05658125b746169c56764a8ccddb1 (patch) | |
| tree | 544a488ae2e65e2fcfe4acce4e56623b85bbce5e /app/graphql/resolvers | |
| parent | e6baeabaa9651d90b03bb64ffce75a2c3cb89aab (diff) | |
| download | gitlab-ce-6f2065c468b05658125b746169c56764a8ccddb1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/graphql/resolvers')
| -rw-r--r-- | app/graphql/resolvers/merge_requests_resolver.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/graphql/resolvers/merge_requests_resolver.rb b/app/graphql/resolvers/merge_requests_resolver.rb index 1740d614b69..406a1fac05c 100644 --- a/app/graphql/resolvers/merge_requests_resolver.rb +++ b/app/graphql/resolvers/merge_requests_resolver.rb @@ -15,7 +15,8 @@ module Resolvers alias_method :project, :object def resolve(**args) - return unless project.present? + project = object.respond_to?(:sync) ? object.sync : object + return MergeRequest.none if project.nil? args[:iids] ||= [args[:iid]].compact |