diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 12:59:19 -0600 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 12:59:19 -0600 |
commit | 606b5094c15f36ebd9d697440446c48b54d40e6c (patch) | |
tree | ddb7bf3dfa8d925c38307bca0ff8837cc9d3741f /app/controllers/projects_controller.rb | |
parent | 7f7a18c0c37a11b1eba2ac5575087b7b85c3ec5f (diff) | |
parent | 1d7b46062feb1d93dd3efaf6ba4d5d934068342c (diff) | |
download | gitlab-ce-improve-table-pagination-spec.tar.gz |
Merge branch 'master' into improve-table-pagination-specimprove-table-pagination-spec
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6f609348402..6f229b08c0c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -353,7 +353,7 @@ class ProjectsController < Projects::ApplicationController end def repo_exists? - project.repository_exists? && !project.empty_repo? && project.repo + project.repository_exists? && !project.empty_repo? rescue Gitlab::Git::Repository::NoRepository project.repository.expire_exists_cache |