diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-02-10 04:21:11 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-02-10 04:21:11 +0000 |
| commit | 57d5a5499cc4248176e3740c3aae3fa99be00752 (patch) | |
| tree | 66fc015a846cf51862d7753dcdb5c5667dd6a6bd /app | |
| parent | e355d8fe287002df0948033a19db9caaf8174555 (diff) | |
| parent | 860c8cfc35956adba73c38b9b21be5c58069ba81 (diff) | |
| download | gitlab-ce-57d5a5499cc4248176e3740c3aae3fa99be00752.tar.gz | |
Merge branch 'protected-branch-dropdown-titles' into 'master'
Added header to protected branches access dropdowns
See merge request !8774
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/protected_branches_controller.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb index 9a438d5512c..2f422d352ed 100644 --- a/app/controllers/projects/protected_branches_controller.rb +++ b/app/controllers/projects/protected_branches_controller.rb @@ -68,8 +68,12 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController def access_levels_options { - push_access_levels: ProtectedBranch::PushAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } }, - merge_access_levels: ProtectedBranch::MergeAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } } + push_access_levels: { + "Roles" => ProtectedBranch::PushAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } }, + }, + merge_access_levels: { + "Roles" => ProtectedBranch::MergeAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } } + } } end |