diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-04-04 22:53:44 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-04-04 22:53:44 +0000 |
| commit | 3ccb4d954f4c51f4f3cc77ebd53f21425e0d4d09 (patch) | |
| tree | 34e357177540128e1a6ab9f7d86077926e0fdf55 /app/views | |
| parent | 9667ae2e97e0be26888514661e2ad947c1c6ea72 (diff) | |
| parent | 8598fb3411521f813f8776f6f992983bf115668b (diff) | |
| download | gitlab-ce-3ccb4d954f4c51f4f3cc77ebd53f21425e0d4d09.tar.gz | |
Merge branch '57319-hide-kubernetes-cluster-warning-if-project-has-cluster-related' into 'master'
Resolve "Hide Kubernetes cluster warning if project has cluster related"
See merge request gitlab-org/gitlab-ce!26749
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/settings/ci_cd/_autodevops_form.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml index fac68a36e79..fe74dc122c3 100644 --- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml +++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml @@ -17,10 +17,11 @@ = s_('CICD|The Auto DevOps pipeline will run if no alternative CI configuration file is found.') = link_to _('More information'), help_page_path('topics/autodevops/index.md'), target: '_blank' .card-footer.js-extra-settings{ class: auto_devops_enabled || 'hidden' } - %p.settings-message.text-center - - kubernetes_cluster_link = help_page_path('user/project/clusters/index') - - kubernetes_cluster_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: kubernetes_cluster_link } - = s_('CICD|You must add a %{kubernetes_cluster_start}Kubernetes cluster integration%{kubernetes_cluster_end} to this project with a domain in order for your deployment strategy to work correctly.').html_safe % { kubernetes_cluster_start: kubernetes_cluster_start, kubernetes_cluster_end: '</a>'.html_safe } + - if @project.all_clusters.empty? + %p.settings-message.text-center + - kubernetes_cluster_link = help_page_path('user/project/clusters/index') + - kubernetes_cluster_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: kubernetes_cluster_link } + = s_('CICD|You must add a %{kubernetes_cluster_start}Kubernetes cluster integration%{kubernetes_cluster_end} to this project with a domain in order for your deployment strategy to work correctly.').html_safe % { kubernetes_cluster_start: kubernetes_cluster_start, kubernetes_cluster_end: '</a>'.html_safe } %label.prepend-top-10 %strong= s_('CICD|Deployment strategy') .form-check |