diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-09-20 18:44:48 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-09-20 18:44:48 +0000 |
commit | a6f2caf7a2e0c18338f943623d61c4cd8b9fbd0c (patch) | |
tree | ff0aa9243983c3ee5f095dc5227e1957df0103b3 | |
parent | 11bbc06b4bbcb678f3ee6b8f1d143ed86d25a76c (diff) | |
parent | a19a0b431c05d7e17aca61f2e04abfe6fb5ac5b2 (diff) | |
download | gitlab-ce-a6f2caf7a2e0c18338f943623d61c4cd8b9fbd0c.tar.gz |
Merge branch 'fix-ci-link-on-project-page' into 'master'
Fix 500 when showing project page and there's no CI project present
This fixes 500 when:
1. GitLabCiService is active
2. There's no project in ci_projects table
See merge request !1338
-rw-r--r-- | app/models/project.rb | 2 |
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 |