diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 12:08:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 12:08:18 +0000 |
| commit | 684d65316ac77c62f47d68b9926eea8af30db227 (patch) | |
| tree | d1f4c4eec399d7772ab4ad6294f98e7505c1cee5 /app/workers | |
| parent | ade18c9d68d5a2e6c6e28ef7e9d3add3b3491ace (diff) | |
| download | gitlab-ce-684d65316ac77c62f47d68b9926eea8af30db227.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/gitlab/github_import/advance_stage_worker.rb | 4 | ||||
| -rw-r--r-- | app/workers/gitlab/import/advance_stage.rb | 2 | ||||
| -rw-r--r-- | app/workers/gitlab/jira_import/advance_stage_worker.rb | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/app/workers/gitlab/github_import/advance_stage_worker.rb b/app/workers/gitlab/github_import/advance_stage_worker.rb index 8bbfb10ed6e..21e478f935b 100644 --- a/app/workers/gitlab/github_import/advance_stage_worker.rb +++ b/app/workers/gitlab/github_import/advance_stage_worker.rb @@ -21,6 +21,10 @@ module Gitlab finish: Stage::FinishImportWorker }.freeze + def find_import_state(project_id) + ProjectImportState.jid_by(project_id: project_id, status: :started) + end + private def next_stage_worker(next_stage) diff --git a/app/workers/gitlab/import/advance_stage.rb b/app/workers/gitlab/import/advance_stage.rb index 5c836413ae3..3f34437294e 100644 --- a/app/workers/gitlab/import/advance_stage.rb +++ b/app/workers/gitlab/import/advance_stage.rb @@ -48,7 +48,7 @@ module Gitlab end def find_import_state(project_id) - ProjectImportState.jid_by(project_id: project_id, status: :started) + raise NotImplementedError end private diff --git a/app/workers/gitlab/jira_import/advance_stage_worker.rb b/app/workers/gitlab/jira_import/advance_stage_worker.rb index 1b6fc54151e..c83a57bcd83 100644 --- a/app/workers/gitlab/jira_import/advance_stage_worker.rb +++ b/app/workers/gitlab/jira_import/advance_stage_worker.rb @@ -16,6 +16,10 @@ module Gitlab finish: Gitlab::JiraImport::Stage::FinishImportWorker }.freeze + def find_import_state(project_id) + ProjectImportState.jid_by(project_id: project_id, status: :started) + end + private def next_stage_worker(next_stage) |