-
- 下载
Merge branch 'fix/persistent-import-data' into 'master'
Fix import_data being saved as a result of an invalid import_url Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19479 Seem that in all cases the `import_url` was an empty string. The `import_url` is now validated correctly and no longer creates the `import_data`even if it fails validation. <= Should cover cases 1, 3, and 4 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276 Also, it now rescues from all exceptions when importing from a URL, so we make sure the `import_status` is failed after that. Covers case 2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276 See merge request !5206
显示
- CHANGELOG 4 个添加, 1 个删除CHANGELOG
- app/models/project.rb 8 个添加, 2 个删除app/models/project.rb
- app/services/projects/import_service.rb 1 个添加, 1 个删除app/services/projects/import_service.rb
- app/views/projects/new.html.haml 6 个添加, 1 个删除app/views/projects/new.html.haml
- app/views/shared/_import_form.html.haml 1 个添加, 1 个删除app/views/shared/_import_form.html.haml
- spec/models/project_spec.rb 20 个添加, 2 个删除spec/models/project_spec.rb
加载中
想要评论请 注册 或 登录