diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-10 11:28:21 +1000 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-07 08:54:07 +0200 |
| commit | 1ef9e9c2aaaffb202f09bf6a245a01bfb5516b6e (patch) | |
| tree | 5df5d0aa0a1789ee035d87f14663d2e5c32c19bc /app/views/projects | |
| parent | 2135949eb55c214828e34384c234b6256b9981ea (diff) | |
| download | gitlab-ce-1ef9e9c2aaaffb202f09bf6a245a01bfb5516b6e.tar.gz | |
Inline runner_path and runners_path helpers
These were just shorthands for project_... and they will be confusing when introducing group runners so we should not have them (#10244)
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/runners/_runner.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/runners/edit.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml index 0d2c0536eb5..894e7d72ce0 100644 --- a/app/views/projects/runners/_runner.html.haml +++ b/app/views/projects/runners/_runner.html.haml @@ -3,7 +3,7 @@ = runner_status_icon(runner) - if @project_runners.include?(runner) - = link_to runner.short_sha, runner_path(runner), class: 'commit-sha' + = link_to runner.short_sha, project_runner_path(@project, runner), class: 'commit-sha' - if runner.locked? = icon('lock', class: 'has-tooltip', title: 'Locked to current projects') @@ -22,7 +22,7 @@ - else = link_to 'Resume', resume_project_runner_path(@project, runner), method: :post, class: 'btn btn-success btn-sm' - 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' + = link_to 'Remove Runner', project_runner_path(@project, runner), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm' - else - runner_project = @project.runner_projects.find_by(runner_id: runner) = link_to 'Disable for this project', project_runner_project_path(@project, runner_project), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm' diff --git a/app/views/projects/runners/edit.html.haml b/app/views/projects/runners/edit.html.haml index 78dc4817ed7..fc5205ecf5e 100644 --- a/app/views/projects/runners/edit.html.haml +++ b/app/views/projects/runners/edit.html.haml @@ -3,4 +3,4 @@ %h4 Runner ##{@runner.id} %hr - = render 'form', runner: @runner, runner_form_url: runner_path(@runner) + = render 'form', runner: @runner, runner_form_url: project_runner_path(@project, @runner) |