diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-24 17:03:40 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-06-24 17:03:40 +0000 |
| commit | 88c9a05771610b12e3853c1c414329442f6f166a (patch) | |
| tree | c9e8709042325803b3addfe614ed749b97e1642a /config | |
| parent | 5d174ee546d0c59ed30858ae6315a8a466cf668e (diff) | |
| parent | e3d464d82a15cb524d066c2ba5d0973efbbfeeef (diff) | |
| download | gitlab-ce-88c9a05771610b12e3853c1c414329442f6f166a.tar.gz | |
Merge branch '19035-fix-merge-issue' into 'master'
Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true
## What does this MR do?
Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true.
## Are there points in the code the reviewer needs to double check?
@stanhu I reused your proposal from the issue, I think it's a good enough solution.
## What are the relevant issue numbers?
Fixes #19035.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [ ] 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 !4912
Diffstat (limited to 'config')
0 files changed, 0 insertions, 0 deletions