diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-15 18:17:08 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-15 18:17:08 +0300 |
| commit | 6f50cef8094d9b14d2bdff731f0eeb01c31516bf (patch) | |
| tree | b03f72adbb3c156bcf893b1218eabbcb7d6c7372 /app/helpers | |
| parent | a628db7b4d8c83a80d3151ba7a4c3d694b1a678c (diff) | |
| parent | e632bd26e4b70b100e5c9891b4b2cc7e267080c9 (diff) | |
Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master'
Fixes "iid of max iid" in Issuable sidebar for merged MR
Fixes #13928.
See merge request !3046
Diffstat (limited to 'app/helpers')
| -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 |