Fix bad conflicts resolution

22d8f934 · Lin Jen-Shin · b3cd850c · 22d8f934
Commit 22d8f934 authored Sep 17, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/models/concerns/issuable.rb app/models/concerns/issuable.rb +2 -2

No files found.
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -109,8 +109,8 @@ module Issuable
      false
    end

-    def etag_caching_enabled?
-      false
+    def has_multiple_assignees?
+      assignees.count > 1
    end
  end