diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-03-09 13:48:07 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:52 +0100 |
| commit | ab520862903749702bceeff3c4d67b90c969e65d (patch) | |
| tree | 44ceb21ff03232ac46dede41bd038675da4510cb /app | |
| parent | 40dd993774814c484d3161c86287dd56cf06e436 (diff) | |
| download | gitlab-ce-ab520862903749702bceeff3c4d67b90c969e65d.tar.gz | |
Show correct message when user cannot resolve discussions
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 9d0c165450b..9e7b48ca79c 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -58,9 +58,12 @@ Creating this issue will resolve all discussions in = link_to_discussions_to_resolve(@merge_request_for_resolving_discussions, @discussion_to_resolve) - else - The discussion at + The + = @discussion_to_resolve ? 'discussion' : 'discussions' + at = link_to_discussions_to_resolve(@merge_request_for_resolving_discussions, @discussion_to_resolve) - will stay unresolved. Ask someone with permission to resolve it. + will stay unresolved. Ask someone with permission to resolve + = @discussion_to_resolve ? 'it.' : 'them.' - is_footer = !(issuable.is_a?(MergeRequest) && issuable.new_record?) .row-content-block{ class: (is_footer ? "footer-block" : "middle-block") } |