Merge pull request #7068 from chino/only-check-ci-status-when-ci-service-enabled

project: ci_service should only catch ci services

Merge pull request #7068 from chino/only-check-ci-status-when-ci-service-enabled
239b84e9 · Dmitriy Zaporozhets · ab7a9347 · be85d1d2 · 239b84e9
Commit 239b84e9 authored Jun 03, 2014 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

project.rb app/models/project.rb +1 -1

No files found.
--- 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