Add latest changes from gitlab-org/gitlab@13-4-stable-ee

2 files changed, 12 insertions, 5 deletions

diff --git a/app/services/wiki_pages/destroy_service.rb b/app/services/wiki_pages/destroy_service.rb
index ab5abe1c82b..1d566f98760 100644
--- a/app/services/wiki_pages/destroy_service.rb
+++ b/app/services/wiki_pages/destroy_service.rb
@@ -3,11 +3,14 @@
 module WikiPages
   class DestroyService < WikiPages::BaseService
     def execute(page)
-      if page&.delete
+      if page.delete
         execute_hooks(page)
+        ServiceResponse.success(payload: { page: page })
+      else
+        ServiceResponse.error(
+          message: _('Could not delete wiki page'), payload: { page: page }
+        )
       end
-
-      page
     end
 
     def usage_counter_action
diff --git a/app/services/wiki_pages/update_service.rb b/app/services/wiki_pages/update_service.rb
index 5ac6902e0b0..f2fc6b37c34 100644
--- a/app/services/wiki_pages/update_service.rb
+++ b/app/services/wiki_pages/update_service.rb
@@ -8,9 +8,13 @@ module WikiPages
 
       if page.update(@params)
         execute_hooks(page)
+        ServiceResponse.success(payload: { page: page })
+      else
+        ServiceResponse.error(
+          message: _('Could not update wiki page'),
+          payload: { page: page }
+        )
       end
-
-      page
     end
 
     def usage_counter_action