From a9ced7da447785c57477b3d8dbccc73a78cface1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 9 Apr 2020 12:09:24 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/graphql/mutations/jira_import/start.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/graphql/mutations') diff --git a/app/graphql/mutations/jira_import/start.rb b/app/graphql/mutations/jira_import/start.rb index ffd3ce53b57..6b80c9f8ca4 100644 --- a/app/graphql/mutations/jira_import/start.rb +++ b/app/graphql/mutations/jira_import/start.rb @@ -30,11 +30,11 @@ module Mutations service_response = ::JiraImport::StartImportService .new(context[:current_user], project, jira_project_key) .execute - import_data = service_response.payload[:import_data] - + jira_import = service_response.success? ? service_response.payload[:import_data] : nil + errors = service_response.error? ? [service_response.message] : [] { - jira_import: import_data.errors.blank? ? import_data.projects.last : nil, - errors: errors_on_object(import_data) + jira_import: jira_import, + errors: errors } end -- cgit v1.2.3