diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-10 12:03:58 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-10 12:03:58 -0700 |
| commit | 961971544abb4a98634a0602ec69c777e9443b4c (patch) | |
| tree | e99ded24dd9d1761231691236b95529c069777a5 /app/controllers | |
| parent | 828519ba05f6b1577b71ba0af37dbdc206518874 (diff) | |
| parent | 14753c2e8556636f378ee42bd4f8130cc2372d3f (diff) | |
| download | gitlab-ce-961971544abb4a98634a0602ec69c777e9443b4c.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/controllers')
| -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 |