diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-20 20:04:15 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-20 20:04:15 +0000 |
| commit | 729ac897fd98b7cadee6af3f764a2efc4ecde43e (patch) | |
| tree | a01f4ce3f4645cece558ce6c65c5f6375452d888 /app/views/admin | |
| parent | e59c1f7954d5272f4fa56fafb302be7afba53333 (diff) | |
| parent | 2b8c46fe1dedd1687e1871a8b4a9892ee0ca070f (diff) | |
| download | gitlab-ce-729ac897fd98b7cadee6af3f764a2efc4ecde43e.tar.gz | |
Merge branch '20817-please-add-coordinator-url-to-admin-area-runner-page' into 'master'
Add coordinator url to admin area runner page
Closes #20817
See merge request !11603
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/runners/index.html.haml | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml index 2da8f615470..126550ee10e 100644 --- a/app/views/admin/runners/index.html.haml +++ b/app/views/admin/runners/index.html.haml @@ -2,26 +2,6 @@ = render "admin/dashboard/head" %div{ class: container_class } - - %p.prepend-top-default - %span - To register a new Runner you should enter the following registration - token. - With this token the Runner will request a unique Runner token and use - that for future communication. - %br - Registration token is - %code#runners-token= current_application_settings.runners_registration_token - - .bs-callout.clearfix - .pull-left - %p - You can reset runners registration token by pressing a button below. - .prepend-top-10 - = button_to "Reset runners registration token", reset_runners_token_admin_application_settings_path, - method: :put, class: 'btn btn-default', - data: { confirm: 'Are you sure you want to reset registration token?' } - .bs-callout %p A 'Runner' is a process which runs a job. @@ -46,6 +26,19 @@ %span.label.label-danger paused \- Runner will not receive any new jobs + .bs-callout.clearfix + .pull-left + %p + You can reset runners registration token by pressing a button below. + .prepend-top-10 + = button_to _("Reset runners registration token"), reset_runners_token_admin_application_settings_path, + method: :put, class: 'btn btn-default', + data: { confirm: _("Are you sure you want to reset registration token?") } + + = render partial: 'ci/runner/how_to_setup_runner', + locals: { registration_token: current_application_settings.runners_registration_token, + type: 'shared' } + .append-bottom-20.clearfix .pull-left = form_tag admin_runners_path, id: 'runners-search', class: 'form-inline', method: :get do |