diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-01 14:32:20 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-08 18:23:20 +0300 |
| commit | e632bd26e4b70b100e5c9891b4b2cc7e267080c9 (patch) | |
| tree | 60bebb20fd06870a3a2a4f1164b7c43571479b17 /app/helpers/issuables_helper.rb | |
| parent | 36730e8e63c0ebe16785f33cb2b740f8d67b2b25 (diff) | |
Fixes "iid of max iid" in Issuable sidebar for merged MR
Fixes #13928
Diffstat (limited to 'app/helpers/issuables_helper.rb')
| -rw-r--r-- | app/helpers/issuables_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 91a3aa371ef..2dfeddf7368 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -31,7 +31,11 @@ module IssuablesHelper end def issuable_state_scope(issuable) - issuable.open? ? :opened : :closed + if issuable.respond_to?(:merged?) && issuable.merged? + :merged + else + issuable.open? ? :opened : :closed + end end end |