summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-13 10:27:05 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-13 10:27:05 +0200
commitaaff356655e47d78d1da6adca314ccf11f02268c (patch)
tree1c388ce1a359a8b343e7e028cd9bca566b966fbf /app
parentb47646ef13597836cad342a4d9372316289f0155 (diff)
downloadgitlab-ce-aaff356655e47d78d1da6adca314ccf11f02268c.tar.gz
Redirect to import page from show when import in progress
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects_controller.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f4087b884c8..8d24052f724 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -48,6 +48,11 @@ class ProjectsController < ApplicationController
end
def show
+ if @project.import_in_progress?
+ redirect_to import_project_path(@project)
+ return
+ end
+
return authenticate_user! unless @project.public? || current_user
limit = (params[:limit] || 20).to_i