diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2018-12-06 12:35:50 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2018-12-06 12:35:50 +0300 |
| commit | 62d971129da99936a3cdc04f3740d26f16a0c7a6 (patch) | |
| tree | 989c69bb87c7a3c4d86b3c70d1f1380959cf4a81 /app/assets/javascripts | |
| parent | 71da313cd43bcbbbc8ec483944f887bacc518d81 (diff) | |
| parent | e282a65b7dd4d2e65ca36aba508a169b1d0899a8 (diff) | |
Merge branch 'mg-fix-knative-application-row' into 'master'
Disable Knative for group clusters
See merge request gitlab-org/gitlab-ce!23577
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 9a96d0fa6d7..665a9c77822 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -296,7 +296,6 @@ export default { :request-status="applications.cert_manager.requestStatus" :request-reason="applications.cert_manager.requestReason" :disabled="!helmInstalled" - class="hide-bottom-border rounded-bottom" title-link="https://cert-manager.readthedocs.io/en/latest/#" > <div slot="description" v-html="certManagerDescription"></div> @@ -396,6 +395,7 @@ export default { </div> </application-row> <application-row + v-if="isProjectCluster" id="knative" :logo-url="knativeLogo" :title="applications.knative.title" @@ -405,7 +405,6 @@ export default { :request-reason="applications.knative.requestReason" :install-application-request-params="{ hostname: applications.knative.hostname }" :disabled="!helmInstalled" - class="hide-bottom-border rounded-bottom" title-link="https://github.com/knative/docs" > <div slot="description"> @@ -432,7 +431,7 @@ export default { /> </div> </template> - <template v-else> + <template v-else-if="helmInstalled"> <div class="form-group"> <label for="knative-domainname"> {{ s__('ClusterIntegration|Knative Domain Name:') }} |