diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-13 12:10:03 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-13 12:10:03 +0000 |
commit | 75ee59f7a108cf0c57e1e66e3ef5e439bae24fcd (patch) | |
tree | b2f1ec89e16c6b27041f608c9fb12b7586e5ce94 /app/workers | |
parent | e79918ce90dc31527be1ef0140a99cfe450d931e (diff) | |
download | gitlab-ce-75ee59f7a108cf0c57e1e66e3ef5e439bae24fcd.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/concerns/project_import_options.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/workers/concerns/project_import_options.rb b/app/workers/concerns/project_import_options.rb index 2baf768bfd1..c8ee5539441 100644 --- a/app/workers/concerns/project_import_options.rb +++ b/app/workers/concerns/project_import_options.rb @@ -18,7 +18,12 @@ module ProjectImportOptions "import" end - project.import_state.mark_as_failed(_("Every %{action} attempt has failed: %{job_error_message}. Please try again.") % { action: action, job_error_message: job['error_message'] }) + if project.jira_import? + project.latest_jira_import.do_fail! + else + project.import_state.mark_as_failed(_("Every %{action} attempt has failed: %{job_error_message}. Please try again.") % { action: action, job_error_message: job['error_message'] }) + end + Sidekiq.logger.warn "Failed #{job['class']} with #{job['args']}: #{job['error_message']}" end end |