summaryrefslogtreecommitdiff
path: root/app/controllers/projects/settings/repository_controller.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-03-07 11:40:27 +0000
committerPhil Hughes <me@iamphill.com>2017-03-07 11:40:27 +0000
commit12fe94c388ae9ec73e34852ef7d7b90f2f347df7 (patch)
tree5182f89deddf9428b1d6ca70720f8ac8ee2b940a /app/controllers/projects/settings/repository_controller.rb
parent002d3a3e72de57c76a077ed5d09e857243c7effd (diff)
parentac9d792946deb17a402646e5481087e4d92f88ad (diff)
downloadgitlab-ce-12fe94c388ae9ec73e34852ef7d7b90f2f347df7.tar.gz
Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages
Diffstat (limited to 'app/controllers/projects/settings/repository_controller.rb')
-rw-r--r--app/controllers/projects/settings/repository_controller.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index a9d10dcddef..b6ce4abca45 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -25,13 +25,13 @@ module Projects
def access_levels_options
{
push_access_levels: {
- "Roles" => ProtectedBranch::PushAccessLevel.human_access_levels.map do |id, text|
- { id: id, text: text, before_divider: true }
+ roles: ProtectedBranch::PushAccessLevel.human_access_levels.map do |id, text|
+ { id: id, text: text, before_divider: true }
end
},
merge_access_levels: {
- "Roles" => ProtectedBranch::MergeAccessLevel.human_access_levels.map do |id, text|
- { id: id, text: text, before_divider: true }
+ roles: ProtectedBranch::MergeAccessLevel.human_access_levels.map do |id, text|
+ { id: id, text: text, before_divider: true }
end
}
}