From 32c3375fe91bfc9212436aba5a2fad79db34e67e Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Mon, 6 Mar 2017 15:06:57 +0000 Subject: Backport protected branches Ruby change from EE --- app/assets/stylesheets/framework/dropdowns.scss | 1 + app/controllers/projects/protected_branches_controller.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 6e8a5cc688b..3b949ea0cd9 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -221,6 +221,7 @@ color: $gl-text-color-secondary; font-size: 13px; line-height: 22px; + text-transform: capitalize; padding: 0 10px; } diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb index 2f422d352ed..ee8c30058a1 100644 --- a/app/controllers/projects/protected_branches_controller.rb +++ b/app/controllers/projects/protected_branches_controller.rb @@ -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 -- cgit v1.2.1