Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2018-04-20 07:17:00 +0300
committerDylan Griffith <dyl.griffith@gmail.com>2018-05-15 11:36:57 +0300
commit46eeaafc255f9cc037f2656fcace67085519bf29 (patch)
tree54c5d5056925e90d2e54d9192ffff6be95ef26f9 /app/views/projects/settings/ci_cd/_autodevops_form.html.haml
parent416a5450e4d8598e87f96f9edc57983502b42397 (diff)
Display help text below auto devops domain with nip.io domain name (#45561)
Diffstat (limited to 'app/views/projects/settings/ci_cd/_autodevops_form.html.haml')
-rw-r--r--app/views/projects/settings/ci_cd/_autodevops_form.html.haml4
1 files changed, 3 insertions, 1 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 71e77dae69e..8cb6c446e18 100644
--- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
@@ -35,7 +35,9 @@
= _('Domain')
= form.text_field :domain, class: 'form-control', placeholder: 'domain.com'
.help-block
- = s_('CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages.')
+ = s_('CICD|A domain is required to use Auto Review Apps and Auto Deploy Stages.')
+ - if cluster_ingress_ip = cluster_ingress_ip(@project)
+ = s_('%{nip_domain} can be used as an alternative to a custom domain.').html_safe % { nip_domain: "<code>#{cluster_ingress_ip}.nip.io</code>".html_safe }
= link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'auto-devops-base-domain'), target: '_blank'
= f.submit 'Save changes', class: "btn btn-success prepend-top-15"