summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-09-17 23:54:52 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-09-18 21:54:00 +0200
commita19a0b431c05d7e17aca61f2e04abfe6fb5ac5b2 (patch)
tree26236a44d18c363298ce678ebb9c3200b0ab5bc6 /app
parentdfa32123e3c655352481a9b00ecb0f11ea631c0a (diff)
downloadgitlab-ce-a19a0b431c05d7e17aca61f2e04abfe6fb5ac5b2.tar.gz
Fix 500 when showing project page and there's no CI project presentfix-ci-link-on-project-page
Diffstat (limited to 'app')
-rw-r--r--app/models/project.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 6e2f9645661..1a5c1c978c9 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -428,7 +428,7 @@ class Project < ActiveRecord::Base
end
def gitlab_ci?
- gitlab_ci_service && gitlab_ci_service.active
+ gitlab_ci_service && gitlab_ci_service.active && gitlab_ci_project.present?
end
def ci_services