summaryrefslogtreecommitdiff
path: root/app/controllers/projects/imports_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/projects/imports_controller.rb')
-rw-r--r--app/controllers/projects/imports_controller.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb
index b8350642804..e2f957a640c 100644
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
@@ -20,7 +20,7 @@ class Projects::ImportsController < Projects::ApplicationController
end
end
- redirect_to project_import_path(@project)
+ redirect_to namespace_project_import_path(@project.namespace, @project)
end
def show
@@ -28,7 +28,8 @@ class Projects::ImportsController < Projects::ApplicationController
if @project.import_finished?
redirect_to(@project) and return
else
- redirect_to new_project_import_path(@project) and return
+ redirect_to new_namespace_project_import_path(@project.namespace,
+ @project) && return
end
end
end
@@ -37,13 +38,14 @@ class Projects::ImportsController < Projects::ApplicationController
def require_no_repo
if @project.repository_exists?
- redirect_to(@project) and return
+ redirect_to(namespace_project_path(@project.namespace, @project)) and return
end
end
def redirect_if_progress
if @project.import_in_progress?
- redirect_to project_import_path(@project) and return
+ redirect_to namespace_project_import_path(@project.namespace, @project) &&
+ return
end
end
end