summaryrefslogtreecommitdiff
path: root/app/services/files/delete_service.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-05 15:01:38 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-05 15:01:38 +0200
commitdfccb06dda344819989fa8d6a9a3c56c5ca0b65f (patch)
tree8231f0538f50159f04a14c9a19bd7367158d1e3c /app/services/files/delete_service.rb
parent22d5d8913bfadb409a66e8ff8543d25bab868015 (diff)
downloadgitlab-ce-dfccb06dda344819989fa8d6a9a3c56c5ca0b65f.tar.gz
Refactor web editorrefactor-web-editor
* fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/services/files/delete_service.rb')
-rw-r--r--app/services/files/delete_service.rb32
1 files changed, 2 insertions, 30 deletions
diff --git a/app/services/files/delete_service.rb b/app/services/files/delete_service.rb
index 2281777604c..27c881c3430 100644
--- a/app/services/files/delete_service.rb
+++ b/app/services/files/delete_service.rb
@@ -2,36 +2,8 @@ require_relative "base_service"
module Files
class DeleteService < Files::BaseService
- def execute
- allowed = ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(ref)
-
- unless allowed
- return error("You are not allowed to push into this branch")
- end
-
- unless repository.branch_names.include?(ref)
- return error("You can only create files if you are on top of a branch")
- end
-
- blob = repository.blob_at_branch(ref, path)
-
- unless blob
- return error("You can only edit text files")
- end
-
- sha = repository.remove_file(
- current_user,
- path,
- params[:commit_message],
- ref
- )
-
- if sha
- after_commit(sha)
- success
- else
- error("Your changes could not be committed, because the file has been changed")
- end
+ def commit
+ repository.remove_file(current_user, @file_path, @commit_message, @target_branch)
end
end
end