Revert "Merge branch 'web-editor-rugged' into 'master'"

This reverts commit 5a1aa49b5533593dc4c6de82279fe44f5f15616c, reversing
changes made to a675bea2c1c1d5d6923cb97b8714eb72d4e4ff9b.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/app/services/files/delete_service.rb b/app/services/files/delete_service.rb
index fabcdc19648..1497a0f883b 100644
--- a/app/services/files/delete_service.rb
+++ b/app/services/files/delete_service.rb
@@ -19,15 +19,14 @@ module Files
         return error("You can only edit text files")
       end
 
-      sha = repository.remove_file(
-        current_user,
-        path,
-        params[:commit_message],
-        ref
+      delete_file_action = Gitlab::Satellite::DeleteFileAction.new(current_user, project, ref, path)
+
+      deleted_successfully = delete_file_action.commit!(
+        nil,
+        params[:commit_message]
       )
 
-      if sha
-        after_commit(sha)
+      if deleted_successfully
         success
       else
         error("Your changes could not be committed, because the file has been changed")