Commit 79c9eab1 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'protected-branch-dropdown-headings' into 'master'

Backport protected branches Ruby change from EE

See merge request !9726
parents e16e1d57 32c3375f
...@@ -221,6 +221,7 @@ ...@@ -221,6 +221,7 @@
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
font-size: 13px; font-size: 13px;
line-height: 22px; line-height: 22px;
text-transform: capitalize;
padding: 0 10px; padding: 0 10px;
} }
......
...@@ -69,10 +69,10 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController ...@@ -69,10 +69,10 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
def access_levels_options def access_levels_options
{ {
push_access_levels: { push_access_levels: {
"Roles" => ProtectedBranch::PushAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } }, roles: ProtectedBranch::PushAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } },
}, },
merge_access_levels: { merge_access_levels: {
"Roles" => ProtectedBranch::MergeAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } } roles: ProtectedBranch::MergeAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } }
} }
} }
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment