Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/gitlab/slash_commands/issue_new.rb b/lib/gitlab/slash_commands/issue_new.rb
index ef368767689..1527fd263e0 100644
--- a/lib/gitlab/slash_commands/issue_new.rb
+++ b/lib/gitlab/slash_commands/issue_new.rb
@@ -21,12 +21,16 @@ module Gitlab
         title = match[:title]
         description = match[:description].to_s.rstrip
 
-        issue = create_issue(title: title, description: description)
+        result = create_issue(title: title, description: description)
 
-        if issue.persisted?
-          presenter(issue).present
+        if result.success?
+          presenter(result[:issue]).present
+        elsif result[:issue]
+          presenter(result[:issue]).display_errors
         else
-          presenter(issue).display_errors
+          Gitlab::SlashCommands::Presenters::Error.new(
+            result.errors.join(', ')
+          ).message
         end
       end