diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-08-19 18:16:55 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-08-19 18:16:55 +0000 |
commit | 82a39e3e698b6332c44f036b735ae98926767057 (patch) | |
tree | d2fc51bf61f8ff82aedf28bee29f5d9b16639a68 /README.md | |
parent | 5e497e6692ca23e32348b74580b1e42c01b17e1a (diff) | |
parent | d0fcd13ea34ab1557d8b071c7a1fb117046261cb (diff) | |
download | gitlab-ce-82a39e3e698b6332c44f036b735ae98926767057.tar.gz |
Merge branch '21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-after-a-push' into 'master'
Resolve "EmailsOnPushWorker incorrectly claims deleted a commit after a push"
## What does this MR do?
Fix the comparison order in the emails on push worker, so regular pushes don't show a message about force pushing.
## Are there points in the code the reviewer needs to double check?
Don't think so, it was just a typo: `after_sha` should map to the `source_branch` argument, because it's the head of the comparison.
## Why was this MR needed?
To fix a regression!
## What are the relevant issue numbers?
Closes #21010.
## Does this MR meet the acceptance criteria?
- [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [x] ~~API support added~~
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5894
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions