diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-05-10 13:19:25 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-05-19 22:01:53 +0200 |
| commit | bf9cc351c28a349ca4c573978c869d2b90209d52 (patch) | |
| tree | a7b8fa4f4e735c964b4d7ba0ba190bb9bae021d5 | |
| parent | 0fd100d28d3748de90aabc3dbbb789e37399f224 (diff) | |
| download | gitlab-ce-bf9cc351c28a349ca4c573978c869d2b90209d52.tar.gz | |
Add minor corrections related to config of runner
| -rw-r--r-- | app/views/projects/runners/_form.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/runners/edit.html.haml | 2 | ||||
| -rw-r--r-- | doc/ci/runners/README.md | 6 | ||||
| -rw-r--r-- | lib/ci/api/runners.rb | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/app/views/projects/runners/_form.html.haml b/app/views/projects/runners/_form.html.haml index 147f1a2ebc8..6be406fa186 100644 --- a/app/views/projects/runners/_form.html.haml +++ b/app/views/projects/runners/_form.html.haml @@ -1,4 +1,5 @@ = form_for runner, url: runner_form_url, html: { class: 'form-horizontal' } do |f| + = form_errors(@runner) .form-group = label :active, "Active", class: 'control-label' .col-sm-10 @@ -10,7 +11,7 @@ .col-sm-10 .checkbox = f.check_box :run_untagged - %span.light This runner can pick jobs without tags + %span.light Indicates whether runner can pick jobs without tags .form-group = label_tag :token, class: 'control-label' do Token diff --git a/app/views/projects/runners/edit.html.haml b/app/views/projects/runners/edit.html.haml index e4aa98080e5..95706888655 100644 --- a/app/views/projects/runners/edit.html.haml +++ b/app/views/projects/runners/edit.html.haml @@ -2,7 +2,5 @@ %h4 Runner ##{@runner.id} -= form_errors(@runner) - %hr = render 'form', runner: @runner, runner_form_url: runner_path(@runner) diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md index e449d3dc61e..b42d7a62ebc 100644 --- a/doc/ci/runners/README.md +++ b/doc/ci/runners/README.md @@ -127,9 +127,9 @@ the appropriate dependencies to run Rails test suites. ### Prevent runner with tags from picking jobs without tags -You can configure runner to prevent it from picking jobs with tags when -runnner does not have tags assigned. This configuration setting is available -in GitLab interface when editting runner details. +You can configure a runner to prevent it from picking jobs with tags when +the runnner does not have tags assigned. This setting is available on each +runner in *Project Settings* > *Runners*. ### Be careful with sensitive information diff --git a/lib/ci/api/runners.rb b/lib/ci/api/runners.rb index 1dc4c8c2cd1..0c41f22c7c5 100644 --- a/lib/ci/api/runners.rb +++ b/lib/ci/api/runners.rb @@ -32,7 +32,7 @@ module Ci tag_list: params[:tag_list] } unless params[:run_untagged].nil? - attributes.merge!(run_untagged: params[:run_untagged]) + attributes[:run_untagged] = params[:run_untagged] end runner = |