summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-27 00:06:23 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-27 00:06:23 +0000
commitbd8a202da68db8c61150d52e246997f04c329110 (patch)
tree27231f7ecf92696b90712510ea408fb7d1b6366b /app/views/admin
parent59a349817c0869e8e0d750884b34256ca4faefca (diff)
downloadgitlab-ce-bd8a202da68db8c61150d52e246997f04c329110.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/application_settings/integrations.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/integrations.html.haml b/app/views/admin/application_settings/integrations.html.haml
index 0aa833e49a8..c6318c9bb2f 100644
--- a/app/views/admin/application_settings/integrations.html.haml
+++ b/app/views/admin/application_settings/integrations.html.haml
@@ -8,5 +8,5 @@
= render_if_exists 'admin/application_settings/slack'
= render 'admin/application_settings/third_party_offers'
= render 'admin/application_settings/snowplow'
-= render 'admin/application_settings/eks' if Feature.enabled?(:create_eks_clusters)
+= render 'admin/application_settings/eks'