diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/graphql/resolvers/design_management/designs_resolver.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/graphql/resolvers/design_management/designs_resolver.rb')
-rw-r--r-- | app/graphql/resolvers/design_management/designs_resolver.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/graphql/resolvers/design_management/designs_resolver.rb b/app/graphql/resolvers/design_management/designs_resolver.rb index 81f94d5cb30..955ea6304e0 100644 --- a/app/graphql/resolvers/design_management/designs_resolver.rb +++ b/app/graphql/resolvers/design_management/designs_resolver.rb @@ -27,19 +27,20 @@ module Resolvers current_user, ids: design_ids(ids), filenames: filenames, - visible_at_version: version(at_version), - order: :id + visible_at_version: version(at_version) ).execute end private def version(at_version) - GitlabSchema.object_from_id(at_version)&.sync if at_version + return unless at_version + + GitlabSchema.object_from_id(at_version, expected_type: ::DesignManagement::Version)&.sync end def design_ids(ids) - ids&.map { |id| GlobalID.parse(id).model_id } + ids&.map { |id| GlobalID.parse(id, expected_type: ::DesignManagement::Design).model_id } end def issue |