diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-12 10:28:35 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-12 10:28:35 +0000 |
| commit | 93301dd2a91e5ecf163aca1186bc279d4faba182 (patch) | |
| tree | c28c95adf0d6eace59b6e885cb4170233663d230 /app/workers/build_email_worker.rb | |
| parent | b7ba5fa06bfb434c9227a2175f936fc31fd3444f (diff) | |
| parent | eac19b289384a6281c75781e79bad21408063c1c (diff) | |
| download | gitlab-ce-93301dd2a91e5ecf163aca1186bc279d4faba182.tar.gz | |
Merge branch 'remove-branch-api' into 'master'
api: expose {should,force}_remove_source_branch
## What does this MR do?
Exposes the `should_remove_source_branch` and `force_remove_source_branch` booleans via the API.
## Are there points in the code the reviewer needs to double check?
I don't think so.
## Why was this MR needed?
See the commit message.
## What are the relevant issue numbers?
N/A
## Screenshots (if relevant)
N/A
## 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)
- [ ] 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 !5184
Diffstat (limited to 'app/workers/build_email_worker.rb')
0 files changed, 0 insertions, 0 deletions