diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 4c39fe98028cb10fbd51471e9d61f5ab27b2b0c0..a1db856dcfb1886c3ea1c82a0523b1dc7afb60a3 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -61,10 +61,10 @@ class Projects::BlobController < Projects::ApplicationController end def destroy - create_commit(Files::DeleteService, success_notice: "The file has been successfully deleted.", - success_path: namespace_project_tree_path(@project.namespace, @project, @target_branch), - failure_view: :show, - failure_path: namespace_project_blob_path(@project.namespace, @project, @id)) + create_commit(Files::DestroyService, success_notice: "The file has been successfully deleted.", + success_path: namespace_project_tree_path(@project.namespace, @project, @target_branch), + failure_view: :show, + failure_path: namespace_project_blob_path(@project.namespace, @project, @id)) end def diff diff --git a/app/services/files/delete_service.rb b/app/services/files/destroy_service.rb similarity index 88% rename from app/services/files/delete_service.rb rename to app/services/files/destroy_service.rb index 50f0ffcac9fda47bb8fbfdcbd079b4d93a1b3be5..c3be806a42d2b08a28de62d66ba18ef35a66f226 100644 --- a/app/services/files/delete_service.rb +++ b/app/services/files/destroy_service.rb @@ -1,5 +1,5 @@ module Files - class DeleteService < Files::BaseService + class DestroyService < Files::BaseService def commit repository.remove_file( current_user, diff --git a/changelogs/unreleased/rename_files_delete_service.yml b/changelogs/unreleased/rename_files_delete_service.yml new file mode 100644 index 0000000000000000000000000000000000000000..4de1c5b0d6368ffdd74ac37f51542552e292a04a --- /dev/null +++ b/changelogs/unreleased/rename_files_delete_service.yml @@ -0,0 +1,4 @@ +--- +title: Rename Files::DeleteService to Files::DestroyService +merge_request: 9110 +author: dixpac diff --git a/lib/api/files.rb b/lib/api/files.rb index c58472de5785bd31b8b2a1b9426536866a995ec5..2ecdd747c8e598dbe9c6759e82e09cb3d8bbf787 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -117,7 +117,7 @@ module API authorize! :push_code, user_project file_params = declared_params(include_missing: false) - result = ::Files::DeleteService.new(user_project, current_user, commit_params(file_params)).execute + result = ::Files::DestroyService.new(user_project, current_user, commit_params(file_params)).execute if result[:status] == :success status(200) diff --git a/spec/lib/gitlab/diff/position_tracer_spec.rb b/spec/lib/gitlab/diff/position_tracer_spec.rb index 8e3e4034c8f021d3e9a46e9d241de9680769ee22..994995b57b8dbfd8a3888cefa412ced50200c94c 100644 --- a/spec/lib/gitlab/diff/position_tracer_spec.rb +++ b/spec/lib/gitlab/diff/position_tracer_spec.rb @@ -122,7 +122,7 @@ describe Gitlab::Diff::PositionTracer, lib: true do end def delete_file(branch_name, file_name) - Files::DeleteService.new( + Files::DestroyService.new( project, current_user, start_branch: branch_name,