summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-03 22:41:04 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-03 22:41:04 +0300
commit0c869ed75cb9d4255cf4e6c268ab5e884169aeb8 (patch)
treee00e98320907467a7202c63bc80e07946907c4fe
parentdf92f825fca070401ef9fdab11af15041543a25a (diff)
parent239b84e933108540618fc3d07b8818bfc82cc142 (diff)
downloadgitlab-ce-0c869ed75cb9d4255cf4e6c268ab5e884169aeb8.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-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 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