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
path: root/app/views
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2019-02-19 19:06:38 +0300
committerMark Lapierre <mlapierre@gitlab.com>2019-02-19 19:06:38 +0300
commit459276846372d8309220a5667cb4389dcfc66281 (patch)
treeb301bafabc0a636fa459e251b933a8fd8ab3eb9e /app/views
parentcd1a907b770136d39ee001bcf7ce4b46a108374b (diff)
parent8cb772bc414269e8c0dccae7c38fab0c58927040 (diff)
Merge branch 'fix-auto-devops-qa-domain-wait-for-build' into 'master'
Fixes for Auto DevOps QA specs See merge request gitlab-org/gitlab-ce!25275
Diffstat (limited to 'app/views')
-rw-r--r--app/views/clusters/clusters/_form.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/clusters/clusters/_form.html.haml b/app/views/clusters/clusters/_form.html.haml
index 7acd9ce0562..9fb91a39387 100644
--- a/app/views/clusters/clusters/_form.html.haml
+++ b/app/views/clusters/clusters/_form.html.haml
@@ -28,7 +28,7 @@
.form-group
%h5= s_('ClusterIntegration|Base domain')
- = field.text_field :base_domain, class: 'col-md-6 form-control js-select-on-focus'
+ = field.text_field :base_domain, class: 'col-md-6 form-control js-select-on-focus qa-base-domain'
.form-text.text-muted
- auto_devops_url = help_page_path('topics/autodevops/index')
- auto_devops_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: auto_devops_url }
@@ -43,4 +43,4 @@
- if can?(current_user, :update_cluster, @cluster)
.form-group
- = field.submit _('Save changes'), class: 'btn btn-success'
+ = field.submit _('Save changes'), class: 'btn btn-success qa-save-domain'