diff options
| author | Ashley Dumaine <adumaine@datto.com> | 2017-09-02 01:39:22 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-09-06 12:07:47 +0300 |
| commit | a3f76b76a4b8db85c6fa557a5e801dcea7195735 (patch) | |
| tree | 730f99b9e673ed511a41113cd713ed39702c839f /app/views/discussions | |
| parent | 959e6d221d6b11c64d17fc9d4734200806c293ab (diff) | |
change collapse to resolve and comments to discussions
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_headline.html.haml | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/app/views/discussions/_headline.html.haml b/app/views/discussions/_headline.html.haml index 25e90924413..a9fe805bfa2 100644 --- a/app/views/discussions/_headline.html.haml +++ b/app/views/discussions/_headline.html.haml @@ -1,10 +1,19 @@ - if discussion.resolved? - .discussion-headline-light.js-discussion-headline - Resolved - - if discussion.resolved_by - by - = link_to_member(@project, discussion.resolved_by, avatar: false) - = time_ago_with_tooltip(discussion.resolved_at, placement: "bottom") + - if project.resolve_outdated_diff_discussions + .discussion-headline-light.js-discussion-headline + Automatically resolved + - if discussion.resolved_by + by + = link_to_member(@project, discussion.resolved_by, avatar: false) + with a push + = time_ago_with_tooltip(discussion.resolved_at, placement: "bottom") + - else + .discussion-headline-light.js-discussion-headline + Resolved + - if discussion.resolved_by + by + = link_to_member(@project, discussion.resolved_by, avatar: false) + = time_ago_with_tooltip(discussion.resolved_at, placement: "bottom") - elsif discussion.updated? .discussion-headline-light.js-discussion-headline Last updated |