diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-07 15:11:12 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 13:14:51 -0500 |
| commit | ef591b87d157d29796e34968ac98e5a7a671b17e (patch) | |
| tree | b2697e1c75d45d4c99b4157425b282cb31ea00a3 /app/models/repository.rb | |
| parent | b0693318c39f347ef57caf51b0b0e70ef5ec898c (diff) | |
| download | gitlab-ce-ef591b87d157d29796e34968ac98e5a7a671b17e.tar.gz | |
Fix commit message plus other little fix.
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index ca31a3f7ce6..c5da9b01f6b 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -628,8 +628,7 @@ class Repository target_sha = find_branch(target_branch).try(:target) # First make revert in temp branch - rm_branch(user, target_branch) if target_sha - success = revert_commit(user, commit, target_branch, base_branch) + success = target_sha ? true : revert_commit(user, commit, target_branch, base_branch) # Make the revert happen in the target branch source_sha = find_branch(target_branch).target |