Update copy for warning on new issue form

1 files changed, 5 insertions, 6 deletions

diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index a10f9caf3c1..907eb399c61 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -53,16 +53,15 @@
         = hidden_field_tag 'merge_request_for_resolving_discussions', @merge_request_for_resolving_discussions.iid
         - if @discussion_to_resolve
           = hidden_field_tag 'discussion_to_resolve', @discussion_to_resolve.id
-          Creating this issue will mark the discussion at
-          = link_to @discussion_to_resolve.noteable.to_reference, Gitlab::UrlBuilder.build(@discussion_to_resolve.first_note)
+          Creating this issue will resolve the discussion in
+          = link_to "#{@merge_request_for_resolving_discussions.to_reference} (discussion #{@discussion_to_resolve.first_note.id})", Gitlab::UrlBuilder.build(@discussion_to_resolve.first_note)
         - else
-          Creating this issue will mark all discussions in
+          Creating this issue will resolve all discussions in
           = link_to @merge_request_for_resolving_discussions.to_reference, merge_request_path(@merge_request_for_resolving_discussions)
-        as resolved.
       - else
-        You can't automatically mark all discussions in
+        The discussion at
         = link_to @merge_request_for_resolving_discussions.to_reference, merge_request_path(@merge_request_for_resolving_discussions)
-        as resolved. Ask someone with sufficient rights to resolve the them.
+        will stay unresolved. Ask someone with permission to resolve it.
 
 - is_footer = !(issuable.is_a?(MergeRequest) && issuable.new_record?)
 .row-content-block{ class: (is_footer ? "footer-block" : "middle-block") }