home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki 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
parent 9908da17c1 02f5673171
commit 4dfd4e0366
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/project.rb
-1
View File
@@ -821,7 +821,6 @@ class Project < ActiveRecord::Base
end
end
<<<<<<< HEAD
def any_runners?(&block)
if runners.active.any?(&block)
return true