diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-08 15:09:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-08 15:09:37 +0300 |
| commit | 96897f83e965318f70032eea0196c4c0b807b1d4 (patch) | |
| tree | 80cd64c9ad08215adffdc3be89497ad1fdab690e /app/views/projects/settings | |
| parent | 5bdbc604c8a08f827c3833e2c28ec0c299bb41fc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/settings')
| -rw-r--r-- | app/views/projects/settings/ci_cd/_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/settings/ci_cd/_form.html.haml b/app/views/projects/settings/ci_cd/_form.html.haml index 4040b1094aa..b50f712922f 100644 --- a/app/views/projects/settings/ci_cd/_form.html.haml +++ b/app/views/projects/settings/ci_cd/_form.html.haml @@ -103,7 +103,7 @@ .input-group %span.input-group-prepend .input-group-text / - = f.text_field :build_coverage_regex, class: 'form-control', placeholder: 'Regular expression' + = f.text_field :build_coverage_regex, class: 'form-control', placeholder: 'Regular expression', data: { qa_selector: 'build_coverage_regex_field' } %span.input-group-append .input-group-text / %p.form-text.text-muted @@ -143,7 +143,7 @@ go test -cover (Go) %code coverage: \d+.\d+% of statements - = f.submit _('Save changes'), class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success", data: { qa_selector: 'save_general_pipelines_changes_button' } %hr diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index 1358077f2b2..4e14426a069 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -5,7 +5,7 @@ - expanded = expanded_by_default? - general_expanded = @project.errors.empty? ? expanded : true -%section.settings#js-general-pipeline-settings.no-animate{ class: ('expanded' if general_expanded) } +%section.settings#js-general-pipeline-settings.no-animate{ class: ('expanded' if general_expanded), data: { qa_selector: 'general_pipelines_settings_content' } } .settings-header %h4 = _("General pipelines") |