summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-06 03:21:08 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-06 03:21:08 +0000
commit8452f94d44f8cc3ceb9b188e4a389a80e04f9eb4 (patch)
tree869edf4fa5bbc4fa5f9093d9df9ff45aa584db75
parent3a113468b6b20836851055781da9f3f18f35be8d (diff)
parent3aa4f9b0e2e40be07297b9a49f07d57689af1a1a (diff)
downloadgitlab-ci-8452f94d44f8cc3ceb9b188e4a389a80e04f9eb4.tar.gz
Merge branch 'improve-instructions' into 'master'
Improve the deploy and job page instructions. /cc @valery See merge request !132
-rw-r--r--app/views/jobs/_deploy_job_edit.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/jobs/_deploy_job_edit.html.haml b/app/views/jobs/_deploy_job_edit.html.haml
index 28c1b77..f04029a 100644
--- a/app/views/jobs/_deploy_job_edit.html.haml
+++ b/app/views/jobs/_deploy_job_edit.html.haml
@@ -21,7 +21,7 @@
.col-sm-10
= job_form.text_field :tag_list, class: 'form-control'
.help-block
- You can setup jobs to only use runners with specific tags.
+ This job will only use runners that contain all these tags.
Leave blank if you want this job to use any runner
.form-group
@@ -30,7 +30,7 @@
.col-sm-10
= job_form.text_field :refs, class: 'form-control', placeholder: "master, staging"
.help-block
- You can specify git references to run deploy jobs. Accepts strings only
+ Run only when the above git refs strings match the branch or tag that was pushed.
.form-group
= f.label :commands, 'Script', class: 'control-label'
@@ -39,7 +39,7 @@
%p.light
All lines will be concatenated into one file and executed.
%br
- If you change the working directory or the environment this will affect all following lines too.
+ If you change the working directory or the environment this will affect all following lines.
%br
= link_to("Example job scripts", "https://gitlab.com/gitlab-org/gitlab-ci/tree/master/doc/examples")
= job_form.link_to_remove "Remove this job", class: 'btn btn-danger pull-right'