diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-23 06:06:22 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-23 06:06:22 +0000 |
| commit | 9e6466c78442075e0f8fb8fe317ffe53dfcb5a95 (patch) | |
| tree | b36877c3b8957449210bb0739d201a68c3c6e1f0 /app/controllers/files_controller.rb | |
| parent | eee14a0c740b53dfba50e1b091d4017ada92ee97 (diff) | |
| parent | b9d1fc2f3bdebe541795d6ef6e94da9e98b043d3 (diff) | |
| download | gitlab-ce-9e6466c78442075e0f8fb8fe317ffe53dfcb5a95.tar.gz | |
Merge branch 'api-remove-branch' into 'master'
New rules for protected branches
This MR change permissions logic for branch removal. Changes listed below:
Before
* developer can remove branch with terminal but not in UI
* masters can remove any branch with UI even protected one
* force-push to protected branch is not allowed but remove is allowed
After
* none can force push or remove protected branches
* developers and masters can remove normal branches with console and UI
Diffstat (limited to 'app/controllers/files_controller.rb')
0 files changed, 0 insertions, 0 deletions