diff options
author | Rémy Coutable <remy@rymai.me> | 2016-02-17 17:05:44 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-02-17 17:05:44 +0300 |
commit | 3d3ac87af991319d6960a963c0975c83bf7e4108 (patch) | |
tree | 5cc0985e4c20a55caf42e9199293188fc0b67a66 /app/controllers/projects/imports_controller.rb | |
parent | 943bed68bc42d02246ddea63a25432d3aba709e7 (diff) |
Redirect /import to project page if no importing at all and repo exists
Fixes #13367.
Diffstat (limited to 'app/controllers/projects/imports_controller.rb')
-rw-r--r-- | app/controllers/projects/imports_controller.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb index 07f355c35b1..196996f1752 100644 --- a/app/controllers/projects/imports_controller.rb +++ b/app/controllers/projects/imports_controller.rb @@ -3,6 +3,7 @@ class Projects::ImportsController < Projects::ApplicationController before_action :authorize_admin_project! before_action :require_no_repo, only: [:new, :create] before_action :redirect_if_progress, only: [:new, :create] + before_action :redirect_if_no_import, only: :show def new end @@ -63,14 +64,19 @@ class Projects::ImportsController < Projects::ApplicationController def require_no_repo if @project.repository_exists? - redirect_to(namespace_project_path(@project.namespace, @project)) + redirect_to namespace_project_path(@project.namespace, @project) end end def redirect_if_progress if @project.import_in_progress? - redirect_to namespace_project_import_path(@project.namespace, @project) && - return + redirect_to namespace_project_import_path(@project.namespace, @project) + end + end + + def redirect_if_no_import + if @project.repository_exists? && @project.no_import? + redirect_to namespace_project_path(@project.namespace, @project) end end end |