From 23fabc081d7476339e96ec0dfdf7cd6744da5375 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Mon, 9 Mar 2015 16:36:41 -0700 Subject: [PATCH] Fixing import redirect loop While importing, don't redirect import actions to the project page, even if the repository exists --- app/controllers/projects/imports_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb index 79d9910ce87..b64491b4666 100644 --- a/app/controllers/projects/imports_controller.rb +++ b/app/controllers/projects/imports_controller.rb @@ -37,7 +37,7 @@ class Projects::ImportsController < Projects::ApplicationController private def require_no_repo - if @project.repository_exists? + if @project.repository_exists? && !@project.import_in_progress? redirect_to(namespace_project_path(@project.namespace, @project)) and return end end