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

Dmitriy Zaporozhets
2 parents df92f825 239b84e9
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
app/models/project.rb
@@ -330,7 +330,7 @@ class Project &lt; 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
	@@ -330,7 +330,7 @@ class Project < ActiveRecord::Base		@@ -330,7 +330,7 @@ class Project < ActiveRecord::Base
330	end	330	end
331		331
332	def ci_service	332	def ci_service
333	- @ci_service \|\|= services.select(&:activated?).first	333	+ @ci_service \|\|= ci_services.select(&:activated?).first
334	end	334	end
335		335
336	# For compatibility with old code	336	# For compatibility with old code