diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-08-31 09:17:23 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-08-31 09:17:23 +0100 |
| commit | f884a4bbd7ccaf448e0d998711d20497cef6ac71 (patch) | |
| tree | 65c9b70b58dea175d188114ce066cd17baf12888 /lib/api/branches.rb | |
| parent | 32a68328d719327d26e82684cdf354ed25598416 (diff) | |
| parent | 3e092caa91853afeab3bb01be10869e45c39de5d (diff) | |
| download | gitlab-ce-repo-bugs.tar.gz | |
Merge remote-tracking branch 'origin/master' into repo-bugsrepo-bugs
Diffstat (limited to 'lib/api/branches.rb')
| -rw-r--r-- | lib/api/branches.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/branches.rb b/lib/api/branches.rb index b87f7cdbad1..a989394ad91 100644 --- a/lib/api/branches.rb +++ b/lib/api/branches.rb @@ -130,7 +130,7 @@ module API commit = user_project.repository.commit(branch.dereferenced_target) - destroy_conditionally!(commit, last_update_field: :authored_date) do + destroy_conditionally!(commit, last_updated: commit.authored_date) do result = DeleteBranchService.new(user_project, current_user) .execute(params[:branch]) |