summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-10-25 10:55:21 +0000
committerDouwe Maan <douwe@gitlab.com>2016-10-25 10:55:21 +0000
commitdd3b451d78e3db1e2b79229677d5af95b025bbc7 (patch)
tree5b07ab0f0597ec8b47ca4b1fa6130e748b1412f3
parentc003fc5091231c60fb9b87c842382f6078b53613 (diff)
parentdb0182e261936c3e800b546d307a3d3834ff9927 (diff)
downloadgitlab-ce-dd3b451d78e3db1e2b79229677d5af95b025bbc7.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
0 files changed, 0 insertions, 0 deletions