Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-29 21:08:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-29 21:08:26 +0300
commitb64a8161c9442d82897a341d6bf935dd3e748b06 (patch)
treeb9953db8607d1393aa8ac588a15f184dd8e183f6 /app/services/jira_import/start_import_service.rb
parent6e33325c1458cb31b4d36a7eec817fa00ec3faaf (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/jira_import/start_import_service.rb')
-rw-r--r--app/services/jira_import/start_import_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/jira_import/start_import_service.rb b/app/services/jira_import/start_import_service.rb
index 59fd463022f..615d06c7c3d 100644
--- a/app/services/jira_import/start_import_service.rb
+++ b/app/services/jira_import/start_import_service.rb
@@ -28,8 +28,8 @@ module JiraImport
rescue => ex
# in case project.save! raises an erorr
Gitlab::ErrorTracking.track_exception(ex, project_id: project.id)
+ jira_import&.do_fail!(error_message: ex.message)
build_error_response(ex.message)
- jira_import.do_fail!
end
def build_jira_import