Merge branch 'master' of github.com:gitlabhq/gitlabhq

0c869ed7 · Dmitriy Zaporozhets · df92f825 · 239b84e9 · 0c869ed7
Commit 0c869ed7 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