diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-18 18:14:12 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-18 18:14:12 +0300 |
| commit | f4f4a6b5303a0889f3fdb1bfe0bb014a6788c4d6 (patch) | |
| tree | 5db5d07a749d974d1afeb5050a9157112a1d687b /app/controllers/projects/imports_controller.rb | |
| parent | 0ac57a540d245a24219519c4093d15b8ab2f536c (diff) | |
Fix specs and behavior for LFS files
Diffstat (limited to 'app/controllers/projects/imports_controller.rb')
| -rw-r--r-- | app/controllers/projects/imports_controller.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb index e9c9edd3a3c..8d8035ef5ff 100644 --- a/app/controllers/projects/imports_controller.rb +++ b/app/controllers/projects/imports_controller.rb @@ -28,7 +28,7 @@ class Projects::ImportsController < Projects::ApplicationController if continue_params redirect_to continue_params[:to], notice: continue_params[:notice] else - redirect_to project_path(@project) + redirect_to project_path(@project), notice: "The project was successfully forked." end elsif @project.import_failed? redirect_to new_namespace_project_import_path(@project.namespace, @project) @@ -43,7 +43,12 @@ class Projects::ImportsController < Projects::ApplicationController private def continue_params - @continue_params ||= params[:continue].permit(:to, :notice, :notice_now) + continue_params = params[:continue] + if continue_params + continue_params.permit(:to, :notice, :notice_now) + else + nil + end end def require_no_repo |