diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-13 18:09:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-13 18:09:24 +0300 |
commit | 37699393e9d68181a04f54ded5ae1b08b6272291 (patch) | |
tree | 6d02f81cb671476f5b9b8a635f9307fd7728d04f /app/helpers/branches_helper.rb | |
parent | 7f59234892f27812dc91044cd63a6a4655e26263 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/branches_helper.rb')
-rw-r--r-- | app/helpers/branches_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb index 2a0242fe2fa..8f87cd5bfe0 100644 --- a/app/helpers/branches_helper.rb +++ b/app/helpers/branches_helper.rb @@ -13,7 +13,11 @@ module BranchesHelper return [] unless access_levels access_levels.map do |level| - { id: level.id, type: :role, access_level: level.access_level } + if level.type == :deploy_key + { id: level.id, type: level.type, deploy_key_id: level.deploy_key_id } + else + { id: level.id, type: :role, access_level: level.access_level } + end end end end |