Skip to content
Snippets Groups Projects
Commit 32c3375f authored by Phil Hughes's avatar Phil Hughes
Browse files

Backport protected branches Ruby change from EE

parent 786adab1
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -221,6 +221,7 @@
color: $gl-text-color-secondary;
font-size: 13px;
line-height: 22px;
text-transform: capitalize;
padding: 0 10px;
}
 
Loading
Loading
Loading
Loading
@@ -69,10 +69,10 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
def access_levels_options
{
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: {
"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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment