diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-29 15:03:20 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-29 15:03:20 +0000 |
commit | 33d1f5904ce94cf2295b94aba6099a502be4b852 (patch) | |
tree | 06ffc47815ad5cf3a401be0fb285e2b8484652a2 /app/views/projects/runners/_runner.html.haml | |
parent | a8691bda3bb8b2db12f7aabe740a0e064c42fd62 (diff) | |
parent | edbbbe3a2777c273b3dea1b40aa23b1b7847ca4f (diff) | |
download | gitlab-ce-33d1f5904ce94cf2295b94aba6099a502be4b852.tar.gz |
Merge branch 'axil/gitlab-ce-typos_runners_pages' into 'master'
Fix grammar and typos in Runners pages
_Originally opened at !1791 by @axil._
- - -
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !6547
Diffstat (limited to 'app/views/projects/runners/_runner.html.haml')
-rw-r--r-- | app/views/projects/runners/_runner.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml index 85225857758..6e58e5a0c78 100644 --- a/app/views/projects/runners/_runner.html.haml +++ b/app/views/projects/runners/_runner.html.haml @@ -15,7 +15,7 @@ .pull-right - 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' + = link_to 'Remove Runner', runner_path(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', namespace_project_runner_project_path(@project.namespace, @project, runner_project), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm' |