summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorArinde Eniola <eniolaarinde1@gmail.com>2016-04-04 18:38:16 +0100
committerArinde Eniola <eniolaarinde1@gmail.com>2016-04-06 20:27:30 +0100
commitffe2f8e679f7718e5064acb0c2504b2b3cc160de (patch)
tree0121eecc44248732d6d51280953bc50c3a3b6757 /app/views/projects
parent8d28f94e7bbf09ecf49ae9d7fab8c9a76abeb7ac (diff)
downloadgitlab-ce-ffe2f8e679f7718e5064acb0c2504b2b3cc160de.tar.gz
fix the failing tests and some changes
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/labels/_label.html.haml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index 4c144c317fd..097a65969a6 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -14,13 +14,13 @@
.label-subscription{data: {url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label)}}
.subscription-status{data: {status: label_subscription_status(label)}}
- %a.subscribe-icon.btn.action-buttons{data: {toggle: "tooltip", original_title: label_subscription_status(label)}}
- %i.fa.fa-rss
+ %a.subscribe-button.btn.action-buttons{data: {toggle: "tooltip"}}
+ %span= label_subscription_toggle_button_text(label)
- if can? current_user, :admin_label, @project
- = link_to edit_namespace_project_label_path(@project.namespace, @project, label), class: 'btn action-buttons', data: {toggle: "tooltip", original_title: "Edit"} do
+ = link_to edit_namespace_project_label_path(@project.namespace, @project, label), title: "Edit", class: 'btn action-buttons', data: {toggle: "tooltip"} do
%i.fa.fa-pencil-square-o
- = link_to namespace_project_label_path(@project.namespace, @project, label), class: 'btn action-buttons remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?", toggle: "tooltip", original_title: "Delete"} do
+ = link_to namespace_project_label_path(@project.namespace, @project, label), title: "Delete", class: 'btn action-buttons remove-row', method: :delete, remote: true, data: {confirm: "Remove this label? Are you sure?", toggle: "tooltip"} do
%i.fa.fa-trash-o
- if current_user