Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 5 deletions

diff --git a/app/graphql/mutations/ci/runner/delete.rb b/app/graphql/mutations/ci/runner/delete.rb
index 88dc426398b..21c3d55881c 100644
--- a/app/graphql/mutations/ci/runner/delete.rb
+++ b/app/graphql/mutations/ci/runner/delete.rb
@@ -20,7 +20,7 @@ module Mutations
           error = authenticate_delete_runner!(runner)
           return { errors: [error] } if error
 
-          runner.destroy!
+          ::Ci::UnregisterRunnerService.new(runner).execute
 
           { errors: runner.errors.full_messages }
         end
diff --git a/app/graphql/mutations/work_items/create.rb b/app/graphql/mutations/work_items/create.rb
index 88b8cefd8d2..3e76239396a 100644
--- a/app/graphql/mutations/work_items/create.rb
+++ b/app/graphql/mutations/work_items/create.rb
@@ -32,13 +32,13 @@ module Mutations
         params = global_id_compatibility_params(attributes).merge(author_id: current_user.id)
 
         spam_params = ::Spam::SpamParams.new_from_request(request: context[:request])
-        work_item = ::WorkItems::CreateService.new(project: project, current_user: current_user, params: params, spam_params: spam_params).execute
+        create_result = ::WorkItems::CreateService.new(project: project, current_user: current_user, params: params, spam_params: spam_params).execute
 
-        check_spam_action_response!(work_item)
+        check_spam_action_response!(create_result[:work_item]) if create_result[:work_item]
 
         {
-          work_item: work_item.valid? ? work_item : nil,
-          errors: errors_on_object(work_item)
+          work_item: create_result.success? ? create_result[:work_item] : nil,
+          errors: create_result.errors
         }
       end