Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
projects.thm.de
GitLab
Commits
4dfd4e03
Commit
4dfd4e03
authored
Dec 16, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-bad-merge' into 'master'
Fix bad merge /cc: @dzaporozhets See merge request !2116
parents
9908da17
02f56731
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
1 deletion
+0
-1
app/models/project.rb
app/models/project.rb
+0
-1
No files found.
app/models/project.rb
View file @
4dfd4e03
...
...
@@ -821,7 +821,6 @@ def unlink_fork
end
end
<<<<<<<
HEAD
def
any_runners?
(
&
block
)
if
runners
.
active
.
any?
(
&
block
)
return
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment