diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 23:40:49 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 23:40:49 +0400 |
| commit | 239b84e933108540618fc3d07b8818bfc82cc142 (patch) | |
| tree | 128ab292eb28c8891348a385f2f5425210e9eaef /app | |
| parent | ab7a9347a164c33eb115b9806ed6261d5bb84505 (diff) | |
| parent | be85d1d2b203120402b95c88036b36d3b7db6dd4 (diff) | |
Merge pull request #7068 from chino/only-check-ci-status-when-ci-service-enabled
project: ci_service should only catch ci services
Diffstat (limited to 'app')
| -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 1e74ae735ba..758ef14703c 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -330,7 +330,7 @@ class Project < ActiveRecord::Base end def ci_service - @ci_service ||= services.select(&:activated?).first + @ci_service ||= ci_services.select(&:activated?).first end # For compatibility with old code |