Fix bad conflicts resolution
This commit is contained in:
parent
b3cd850c3f
commit
22d8f934ef
1 changed files with 2 additions and 2 deletions
|
@ -109,8 +109,8 @@ module Issuable
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
def etag_caching_enabled?
|
def has_multiple_assignees?
|
||||||
false
|
assignees.count > 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue