summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-05-10 17:10:07 +0000
committerRobert Speicher <robert@gitlab.com>2016-05-10 17:10:07 +0000
commit48c80fdf43e44ae003753c81a832fc2c0eafdb5d (patch)
tree22ced31e05336a564b9ec16d5399cbc99e49420c /app/views
parent0cc8cee6cd58cfa8e34eccccb14fb146630f9cb7 (diff)
parentbbc94e15a3f66852ac3283388327e25d92ae9c0a (diff)
downloadgitlab-ce-48c80fdf43e44ae003753c81a832fc2c0eafdb5d.tar.gz
Merge branch 'fix/remove-broken-inline-runner-desc-edit' into 'master'
Remove broken inline runner description edit form This remove inline form for editing runnner's description. It is broken because of missing partial / incorrect response and it also does not make much sense, since we have under 'Edit' button a form that makes it possible to edit more than just a description. See merge request !4095
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/runners/_runner.html.haml12
1 files changed, 2 insertions, 10 deletions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
index 6745e58deca..36b21eefdee 100644
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -11,18 +11,10 @@
= link_to admin_runner_path(runner) do
= runner.short_sha
%td
- .runner-description
- = runner.description
- %span (#{link_to 'edit', '#', class: 'edit-runner-link'})
- .runner-description-form.hide
- = form_for [:admin, runner], remote: true, html: { class: 'form-inline' } do |f|
- .form-group
- = f.text_field :description, class: 'form-control'
- = f.submit 'Save', class: 'btn'
- %span (#{link_to 'cancel', '#', class: 'cancel'})
+ = runner.description
%td
- if runner.shared?
- \-
+ n/a
- else
= runner.projects.count(:all)
%td