Add latest changes from gitlab-org/gitlab@12-6-stable-ee

1 files changed, 7 insertions, 25 deletions

diff --git a/lib/gitlab/slash_commands/presenters/issue_close.rb b/lib/gitlab/slash_commands/presenters/issue_close.rb
index b3f24f4296a..f8d9af2c3c6 100644
--- a/lib/gitlab/slash_commands/presenters/issue_close.rb
+++ b/lib/gitlab/slash_commands/presenters/issue_close.rb
@@ -7,43 +7,25 @@ module Gitlab
         include Presenters::IssueBase
 
         def present
-          if @resource.confidential?
-            ephemeral_response(close_issue)
+          if resource.confidential?
+            ephemeral_response(response_message)
           else
-            in_channel_response(close_issue)
+            in_channel_response(response_message)
           end
         end
 
         def already_closed
-          ephemeral_response(text: "Issue #{@resource.to_reference} is already closed.")
+          ephemeral_response(text: "Issue #{resource.to_reference} is already closed.")
         end
 
         private
 
-        def close_issue
-          {
-            attachments: [
-              {
-                title:        "#{@resource.title} · #{@resource.to_reference}",
-                title_link:   resource_url,
-                author_name:  author.name,
-                author_icon:  author.avatar_url,
-                fallback:     "Closed issue #{@resource.to_reference}: #{@resource.title}",
-                pretext:      pretext,
-                color:        color(@resource),
-                fields:       fields,
-                mrkdwn_in: [
-                  :title,
-                  :pretext,
-                  :fields
-                ]
-              }
-            ]
-          }
+        def fallback_message
+          "Closed issue #{issue.to_reference}: #{issue.title}"
         end
 
         def pretext
-          "I closed an issue on #{author_profile_link}'s behalf: *#{@resource.to_reference}* in #{project_link}"
+          "I closed an issue on #{author_profile_link}'s behalf: *#{issue.to_reference}* in #{project_link}"
         end
       end
     end