diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 12:09:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 12:09:13 +0000 |
| commit | 1363ca12f1f07c634647cf55c4c16b7401098673 (patch) | |
| tree | d932caf09c8148322edb51ae954ed159ff7d00f8 /app/controllers/projects/import | |
| parent | 6763d2787670bc03a36a8eb601703e88fc70dece (diff) | |
| download | gitlab-ce-1363ca12f1f07c634647cf55c4c16b7401098673.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/import')
| -rw-r--r-- | app/controllers/projects/import/jira_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects/import/jira_controller.rb b/app/controllers/projects/import/jira_controller.rb index c74c180fa20..d38d9e27347 100644 --- a/app/controllers/projects/import/jira_controller.rb +++ b/app/controllers/projects/import/jira_controller.rb @@ -42,11 +42,13 @@ module Projects def schedule_import(params) import_data = @project.create_or_update_import_data(data: {}).becomes(JiraImportData) - import_data << JiraImportData::JiraProjectDetails.new( + jira_project_details = JiraImportData::JiraProjectDetails.new( params[:jira_project_key], Time.now.strftime('%Y-%m-%d %H:%M:%S'), { user_id: current_user.id, name: current_user.name } ) + import_data << jira_project_details + import_data.force_import! @project.import_type = 'jira' @project.import_state.schedule if @project.save |