diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-06-20 16:52:05 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-06-20 16:52:05 +0800 |
| commit | 4efc1c4a68538126bc4cfad6d9b60710bee36f14 (patch) | |
| tree | b0800ee7ce399e064e83f422ab02c21ef286caa9 /app/views/projects/runners | |
| parent | 60ef0dd20c91fd8d8f04ec139edaa07dbab86d1b (diff) | |
| download | gitlab-ce-4efc1c4a68538126bc4cfad6d9b60710bee36f14.tar.gz | |
Rename according to:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12563922
For clarification and consistency
Diffstat (limited to 'app/views/projects/runners')
| -rw-r--r-- | app/views/projects/runners/_runner.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/runners/_specific_runners.html.haml | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml index 13113f9b88f..3cf66bbcb4a 100644 --- a/app/views/projects/runners/_runner.html.haml +++ b/app/views/projects/runners/_runner.html.haml @@ -2,7 +2,7 @@ %h4 = runner_status_icon(runner) %span.monospace - - if @runners.include?(runner) + - if @project_runners.include?(runner) = link_to runner.short_sha, runner_path(runner) - if runner.locked? = icon('lock', class: 'has-tooltip', title: 'Exclusive to this project') @@ -13,7 +13,7 @@ = runner.short_sha .pull-right - - if @runners.include?(runner) + - if @project_runners.include?(runner) - if runner.belongs_to_one_project? = link_to 'Remove runner', runner_path(runner), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm' - else diff --git a/app/views/projects/runners/_specific_runners.html.haml b/app/views/projects/runners/_specific_runners.html.haml index 8ae9f0d95f7..d469dda5b81 100644 --- a/app/views/projects/runners/_specific_runners.html.haml +++ b/app/views/projects/runners/_specific_runners.html.haml @@ -17,13 +17,13 @@ Start runner! -- if @runners.any? +- if @project_runners.any? %h4.underlined-title Runners activated for this project %ul.bordered-list.activated-specific-runners - = render partial: 'runner', collection: @runners, as: :runner + = render partial: 'runner', collection: @project_runners, as: :runner -- if @specific_runners.any? +- if @assignable_runners.any? %h4.underlined-title Available specific runners %ul.bordered-list.available-specific-runners - = render partial: 'runner', collection: @specific_runners, as: :runner - = paginate @specific_runners + = render partial: 'runner', collection: @assignable_runners, as: :runner + = paginate @assignable_runners |