diff options
| author | DJ Mountney <dmountney@perforce.com> | 2015-03-10 02:36:41 +0300 |
|---|---|---|
| committer | DJ Mountney <dmountney@perforce.com> | 2015-03-10 02:36:41 +0300 |
| commit | 23fabc081d7476339e96ec0dfdf7cd6744da5375 (patch) | |
| tree | 7bd64d394de1becf9156605f62edb12c2b9664e0 /app/controllers/projects/imports_controller.rb | |
| parent | e89ffd546eafad4e03ce5b17b5c9147b70afeedc (diff) | |
Fixing import redirect loop
While importing, don't redirect import actions to the project page, even if the repository exists
Diffstat (limited to 'app/controllers/projects/imports_controller.rb')
| -rw-r--r-- | app/controllers/projects/imports_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |