Merge branch 'rename_files_delete_service' into 'master'
Rename Files::DeleteService to Files::DestroyService See merge request !9110
This commit is contained in:
commit
b609ee55f2
5 changed files with 11 additions and 7 deletions
|
@ -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
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
module Files
|
||||
class DeleteService < Files::BaseService
|
||||
class DestroyService < Files::BaseService
|
||||
def commit
|
||||
repository.remove_file(
|
||||
current_user,
|
4
changelogs/unreleased/rename_files_delete_service.yml
Normal file
4
changelogs/unreleased/rename_files_delete_service.yml
Normal file
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Rename Files::DeleteService to Files::DestroyService
|
||||
merge_request: 9110
|
||||
author: dixpac
|
|
@ -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)
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue