Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2017-12-20 18:57:27 +0300
committerRubén Dávila <ruben@gitlab.com>2017-12-20 18:57:27 +0300
commitc927e57466b6c705891f09c95f566259d8e1ec0e (patch)
treec464abfd7c7f7138ea5ae0dabebd7e9f3a0680b2 /app/services/files/delete_service.rb
parentc210ddab9289e29fadc9a5a0462ffbe864af736c (diff)
Updates from last code review:
- Apply some refactoring for code reuse - Add file status validation for Files::DeleteService - Write additional specs
Diffstat (limited to 'app/services/files/delete_service.rb')
-rw-r--r--app/services/files/delete_service.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/services/files/delete_service.rb b/app/services/files/delete_service.rb
index 7952e5c95d4..32a57484d4e 100644
--- a/app/services/files/delete_service.rb
+++ b/app/services/files/delete_service.rb
@@ -11,5 +11,15 @@ module Files
start_project: @start_project,
start_branch_name: @start_branch)
end
+
+ private
+
+ def validate!
+ super
+
+ if file_has_changed?(@file_path, @last_commit_sha)
+ raise FileChangedError, "You are attempting to delete a file that has been previously updated."
+ end
+ end
end
end