diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-09 09:37:38 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-09 09:37:38 +0000 |
| commit | 7e8dc22dd7fb730d3fc47150cdfe95dc9ffdbc3a (patch) | |
| tree | 17fb42e05aaa61b59bb4e95d72c42831c6de540f /Gemfile.lock | |
| parent | 291678d61358c141a7ba8cabf0e645408b52a8ea (diff) | |
| parent | 903151141da36ed9b8c2333a9b66f5c611e4efb6 (diff) | |
| download | gitlab-ce-7e8dc22dd7fb730d3fc47150cdfe95dc9ffdbc3a.tar.gz | |
Merge branch 'merge-if-green' into 'master'
Merge when build succeeds
### What does this MR do?
Adds a button to a MR when the build/ci is running so it can be merged when/if the build is successfull.
### Are there points in the code the reviewer needs to double check?
English spelling and whether or not the grammer is correct.
### Why was this MR needed?
When you expect its all good, and don't want to revisit the current MR it can be accepted allready.
### What are the relevant issue numbers / Feature requests?
Fixes #2640 -- although `Merge if green` is replaced with `Merge when the build succeeds` the general idea is the same.
### Screenshots (if relevant)
### Further considerations
What if there are minor things needed solving, e.g. Rubocop, the current implementation will reset the approved status of the MR. It might be a consideration keep the approval for team member, or even guests. This would require an extra option in the Admin screen, though might add extra value.
#### TODO
- [x] Docs
- [x] Specs
/cc @DouweM @rspeicher
See merge request !1729
Diffstat (limited to 'Gemfile.lock')
0 files changed, 0 insertions, 0 deletions