diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-09-05 16:49:05 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-09-06 10:08:03 +0100 |
| commit | e8f29569bcb4a2d732a2c00b34958f58d5622836 (patch) | |
| tree | 41b69a559246c423699c741d2f9f252911a2e525 /app/views/discussions | |
| parent | ac816d90d4cc116117497479f400211a43db6be1 (diff) | |
| download | gitlab-ce-e8f29569bcb4a2d732a2c00b34958f58d5622836.tar.gz | |
Resolve outdated diff discussions on push
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_headline.html.haml | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/app/views/discussions/_headline.html.haml b/app/views/discussions/_headline.html.haml index a9fe805bfa2..b865eb815f0 100644 --- a/app/views/discussions/_headline.html.haml +++ b/app/views/discussions/_headline.html.haml @@ -1,19 +1,12 @@ - if discussion.resolved? - - 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") + .discussion-headline-light.js-discussion-headline + = discussion_resolved_intro(discussion) + - if discussion.resolved_by + by + = link_to_member(@project, discussion.resolved_by, avatar: false) + - if discussion.resolved_by_push? + with a push + = time_ago_with_tooltip(discussion.resolved_at, placement: "bottom") - elsif discussion.updated? .discussion-headline-light.js-discussion-headline Last updated |