Use commit date for branches and tagsapi-delete-respect-headers

1 files changed, 11 insertions, 4 deletions

diff --git a/lib/api/branches.rb b/lib/api/branches.rb
index 73a7e939627..38c24e6da07 100644
--- a/lib/api/branches.rb
+++ b/lib/api/branches.rb
@@ -121,11 +121,18 @@ module API
       delete ":id/repository/branches/:branch", requirements: { branch: /.+/ } do
         authorize_push_project
 
-        result = DeleteBranchService.new(user_project, current_user).
-                 execute(params[:branch])
+        branch = user_project.repository.find_branch(params[:branch])
+        not_found!('Branch') unless branch
+
+        commit = user_project.repository.commit(branch.dereferenced_target)
+
+        destroy_conditionally!(commit, last_update_field: :authored_date) do
+          result = DeleteBranchService.new(user_project, current_user).
+                   execute(params[:branch])
 
-        if result[:status] != :success
-          render_api_error!(result[:message], result[:return_code])
+          if result[:status] != :success
+            render_api_error!(result[:message], result[:return_code])
+          end
         end
       end