summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-09-13 07:45:35 +0000
committerRémy Coutable <remy@rymai.me>2017-09-13 07:45:35 +0000
commit3b215d051857c14ee27e9d906fedea934f1ca92d (patch)
treeb2c07ef861ac1ee76e5eebe3820e01aedf6d946d
parent12accbf796ba2de01359a9eb21aabfa6cc3dde6a (diff)
parent30dc5ef4191af4555c45c0dda93057733ae44837 (diff)
downloadgitlab-ce-3b215d051857c14ee27e9d906fedea934f1ca92d.tar.gz
Merge branch '37405-admin-page-runner-tag-help-update' into 'master'
Add help text to runner edit page that tags should be separated by commas. Closes #37405 See merge request !14224
-rw-r--r--app/views/projects/runners/_form.html.haml2
-rw-r--r--changelogs/unreleased/37405-admin-page-runner-tag-help-update.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml
index ac8e15a48b2..de85615c672 100644
--- a/app/views/projects/runners/_form.html.haml
+++ b/app/views/projects/runners/_form.html.haml
@@ -39,6 +39,6 @@
Tags
.col-sm-10
= f.text_field :tag_list, value: runner.tag_list.sort.join(', '), class: 'form-control'
- .help-block You can setup jobs to only use Runners with specific tags
+ .help-block You can setup jobs to only use Runners with specific tags. Separate tags with commas.
.form-actions
= f.submit 'Save changes', class: 'btn btn-save'
diff --git a/changelogs/unreleased/37405-admin-page-runner-tag-help-update.yml b/changelogs/unreleased/37405-admin-page-runner-tag-help-update.yml
new file mode 100644
index 00000000000..bec7da26b1a
--- /dev/null
+++ b/changelogs/unreleased/37405-admin-page-runner-tag-help-update.yml
@@ -0,0 +1,5 @@
+---
+title: 'Add help text to runner edit: tags should be separated by commas.'
+merge_request:
+author: Brendan O'Leary
+type: added