GitLab wird am Donnerstag, den 27. Januar, zwischen 08:00 und 12:00 Uhr wegen wichtigen Wartungsarbeiten nicht zur Verfügung stehen.

Unverified Commit 2df34c20 authored by Connor Shea's avatar Connor Shea
Browse files

Fix a lingering conflict.

parent c648756a
......@@ -109,11 +109,7 @@ def to_discussion
private
def supported?
<<<<<<< HEAD
for_commit? || self.noteable.support_new_diff_notes?
=======
!self.for_merge_request? || self.noteable.has_complete_diff_refs?
>>>>>>> master
for_commit? || self.noteable.has_complete_diff_refs?
end
def noteable_diff_refs
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment