summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-01-08 13:01:53 -0600
committerClement Ho <ClemMakesApps@gmail.com>2018-01-08 13:01:53 -0600
commita2b80c89d8b6b38eb1f5c59109006ea48a2e9e5a (patch)
tree2d22d33ab68a57d4c934f0c44b43621f482cb192 /app/controllers/projects_controller.rb
parent65791c9c2a234685e297e334dd3d56e56858f27c (diff)
parent1d7b46062feb1d93dd3efaf6ba4d5d934068342c (diff)
downloadgitlab-ce-move-markdown-preview.tar.gz
Merge branch 'master' into move-markdown-previewmove-markdown-preview
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb2
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