diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-12-03 12:05:32 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-12-03 12:05:32 +0000 |
| commit | 6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (patch) | |
| tree | 0815d8afb23654c10f2c3c38f8e74866292ed7cf | |
| parent | b4b67b020a557a421247f88da8a1bf5060b39e0f (diff) | |
| parent | b871c38bf2ca23c915fd5ce55ecfb2245b53bbe3 (diff) | |
| download | gitlab-ce-6689224a90f3d2500be5d927ea1ed9656fc7b1b6.tar.gz | |
Merge branch 'fix_master' into 'master'
Fix failures in master
See merge request !1974
| -rw-r--r-- | app/views/admin/labels/_label.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 2 |
2 files changed, 2 insertions, 2 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?"} diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 3a898dfbcfd..eab5333ca29 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -23,7 +23,7 @@ = link_to 'Reopen Milestone', namespace_project_milestone_path(@project.namespace, @project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-reopen btn-grouped" = link_to namespace_project_milestone_path(@project.namespace, @project, @milestone), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-grouped btn-remove" do %i.fa.fa-trash-o - Remove + Delete %hr - if @milestone.issues.any? && @milestone.can_be_closed? |