diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-05 15:46:41 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-05 15:46:41 +0000 |
| commit | 13b1508c3ed9887d9fcffdad66cbcf90b14eabd9 (patch) | |
| tree | fb5c76469015186badbbb1af0c6375c4e4de2df4 /app/helpers | |
| parent | 2ea6900882edb151bfb2ee4ef9733a9fc7b521f6 (diff) | |
| parent | e3188eb13e3145e9bd4b123c304e43b18eeb1154 (diff) | |
| download | gitlab-ce-13b1508c3ed9887d9fcffdad66cbcf90b14eabd9.tar.gz | |
Merge branch '34758-deployment-cluster' into 'master'
Use group clusters when deploying (DeploymentPlatform)
See merge request gitlab-org/gitlab-ce!22308
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/groups_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index e9b9b9b7721..866fc555856 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -140,7 +140,7 @@ module GroupsHelper can?(current_user, "read_group_#{resource}".to_sym, @group) end - if can?(current_user, :read_cluster, @group) && Feature.enabled?(:group_clusters) + if can?(current_user, :read_cluster, @group) && @group.group_clusters_enabled? links << :kubernetes end |