summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-21 17:05:13 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-21 17:05:13 +0000
commit5a381e58bf71ff3e588707fa92f46c7b0cb4d9d0 (patch)
tree52a411740ee673a18af673f7161104e32e5a5726
parentc9fcae8e855139362532a9c1f63b688a6b3b3107 (diff)
parent1eb238901b4e3e2f1f9dd1c841e29846630b1278 (diff)
downloadgitlab-ce-5a381e58bf71ff3e588707fa92f46c7b0cb4d9d0.tar.gz
Merge branch '28389-ux-problem-with-pipeline-coverage-placeholder' into 'master'
Changed coverage reg expression placeholder text to be more like a placeholder Closes #28389 See merge request !9407
-rw-r--r--app/views/projects/pipelines_settings/_show.html.haml2
-rw-r--r--changelogs/unreleased/28389-ux-problem-with-pipeline-coverage-placeholder.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/pipelines_settings/_show.html.haml b/app/views/projects/pipelines_settings/_show.html.haml
index 8024fb8979d..132f6372e40 100644
--- a/app/views/projects/pipelines_settings/_show.html.haml
+++ b/app/views/projects/pipelines_settings/_show.html.haml
@@ -60,7 +60,7 @@
= f.label :build_coverage_regex, "Test coverage parsing", class: 'label-light'
.input-group
%span.input-group-addon /
- = f.text_field :build_coverage_regex, class: 'form-control', placeholder: '\(\d+.\d+\%\) covered'
+ = f.text_field :build_coverage_regex, class: 'form-control', placeholder: 'Regular expression'
%span.input-group-addon /
%p.help-block
A regular expression that will be used to find the test coverage
diff --git a/changelogs/unreleased/28389-ux-problem-with-pipeline-coverage-placeholder.yml b/changelogs/unreleased/28389-ux-problem-with-pipeline-coverage-placeholder.yml
new file mode 100644
index 00000000000..ed357d86fe3
--- /dev/null
+++ b/changelogs/unreleased/28389-ux-problem-with-pipeline-coverage-placeholder.yml
@@ -0,0 +1,4 @@
+---
+title: Changed coverage reg expression placeholder text to be more like a placeholder
+merge_request:
+author: