Skip to content
代码片段 群组 项目
提交 e8d52fc5 编辑于 作者: Mehmet Emin INAC's avatar Mehmet Emin INAC
浏览文件

Merge branch 'chore/return-deploy-key-title' into 'master'

Return deploy key title when humanizing access levels

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126033



Merged-by: default avatarMehmet Emin INAC <minac@gitlab.com>
Approved-by: default avatarMehmet Emin INAC <minac@gitlab.com>
Co-authored-by: default avatarJoe Woodward <jwoodward@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -24,7 +24,7 @@ def type ...@@ -24,7 +24,7 @@ def type
end end
def humanize def humanize
return "Deploy key" if deploy_key.present? return deploy_key.title if deploy_key?
super super
end end
......
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
get api(route, user) get api(route, user)
expect(json_response['push_access_levels']).to include( expect(json_response['push_access_levels']).to include(
a_hash_including('access_level_description' => 'Deploy key', 'deploy_key_id' => deploy_key.id) a_hash_including('access_level_description' => deploy_key.title, 'deploy_key_id' => deploy_key.id)
) )
end end
end end
......
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
get api(route, user) get api(route, user)
expect(json_response['create_access_levels']).to include( expect(json_response['create_access_levels']).to include(
a_hash_including('access_level_description' => 'Deploy key', 'deploy_key_id' => deploy_key.id) a_hash_including('access_level_description' => deploy_key.title, 'deploy_key_id' => deploy_key.id)
) )
end end
end end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册