diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:21:19 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:21:19 +0100 |
commit | 0520cd716435afa36204dd882f9cb7a23f81b11d (patch) | |
tree | 39228fbaef420e8ef70c41e84322d0c5aea041e0 /app/views/admin/labels | |
parent | 129ad8425e8fcbb1d7025e247d29772831d76b06 (diff) | |
parent | 6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff) | |
download | gitlab-ce-0520cd716435afa36204dd882f9cb7a23f81b11d.tar.gz |
Merge branch 'master' into ui/form-consistency
Diffstat (limited to 'app/views/admin/labels')
-rw-r--r-- | app/views/admin/labels/_label.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/labels/_label.html.haml b/app/views/admin/labels/_label.html.haml index 596e06243dd..e3ccbf6c3a8 100644 --- a/app/views/admin/labels/_label.html.haml +++ b/app/views/admin/labels/_label.html.haml @@ -2,4 +2,4 @@ = render_colored_label(label) .pull-right = link_to 'Edit', edit_admin_label_path(label), class: 'btn btn-sm' - = link_to 'Remove', admin_label_path(label), class: 'btn btn-sm btn-remove remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?"} + = link_to 'Delete', admin_label_path(label), class: 'btn btn-sm btn-remove remove-row', method: :delete, remote: true, data: {confirm: "Delete this label? Are you sure?"} |