diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-09-17 15:31:23 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-09-17 15:33:14 +0300 |
| commit | 22d8f934ef2ca3ac57524f2345a016e2fe935799 (patch) | |
| tree | 3ac0a4399b073d7d030b3d4ef5ce63ec5700512d /app | |
| parent | b3cd850c3f47ab2527b13d5038abb99893a6bff9 (diff) | |
Fix bad conflicts resolution
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/concerns/issuable.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 7be890e5a25..5f65fceb7af 100644 --- 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 |