diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-10-24 12:55:02 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-10-24 12:55:02 +0000 |
| commit | 6e693771e81c7e1f8e80f6364e4b8d9a1e000dc1 (patch) | |
| tree | 84ec93a246e8b902df81599dd26c894948089011 /docker-compose.yml | |
| parent | f2644adf8b2352ddadc14687ee0dc172a8416d1c (diff) | |
| parent | db0182e261936c3e800b546d307a3d3834ff9927 (diff) | |
| download | gitlab-ce-6e693771e81c7e1f8e80f6364e4b8d9a1e000dc1.tar.gz | |
Merge branch '21513-fix-branch-protection-api' into 'master'
Fix branch protection API.
## What does this MR do?
- Fixes the branch protection API.
- Closes #21513
- EE Merge Request: gitlab-org/gitlab-ee!718
## Tasks
- [ ] #21513 !6215 Protected branches API bug
- [x] Investigate
- [x] Test + Fix
- [x] Changelog
- [x] MR
- [x] Wait for build to pass
- [x] Review
- [x] Check for EE conflicts
- [x] Create EE MR
- [x] Refactor + Fix
- [x] Rebase EE MR against EE master
- [x] Wait for builds to pass
- [x] Assign to dbalexandre/douwe
- [x] Implement latest review comments
- [x] Wait for Douwe's review
- [x] Implement changes
- [x] Port changes to EE MR
- [x] Assign both back to Douwe
- [ ] Wait for merge
- [ ] Merge gitlab-org/gitlab-ee!718
See merge request !6215
Diffstat (limited to 'docker-compose.yml')
0 files changed, 0 insertions, 0 deletions