kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-bad-merge' into 'master'

Browse source 
Fix bad merge

/cc: @dzaporozhets 

See merge request !2116
This commit is contained in:
Douwe Maan 2015-12-16 16:48:30 +00:00
commit 4dfd4e0366
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/project.rb
View file

@ -821,7 +821,6 @@ class Project < ActiveRecord::Base
end
end
<<<<<<< HEAD
def any_runners?(&block)
if runners.active.any?(&block)
return true