summaryrefslogtreecommitdiff
path: root/app/views/shared/_label.html.haml
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2018-03-01 16:09:25 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2018-03-06 16:32:26 -0600
commita16547e5c2d42bfe7af025556e90f0f895a97f59 (patch)
tree093a4c25545f78454fda80c681570e264aab143b /app/views/shared/_label.html.haml
parentf42397d19a735de2e5ae38725270614826ec05da (diff)
downloadgitlab-ce-a16547e5c2d42bfe7af025556e90f0f895a97f59.tar.gz
used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestones
Diffstat (limited to 'app/views/shared/_label.html.haml')
-rw-r--r--app/views/shared/_label.html.haml7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml
index b49be4a4376..5afbc78df53 100644
--- a/app/views/shared/_label.html.haml
+++ b/app/views/shared/_label.html.haml
@@ -48,15 +48,16 @@
.pull-right.hidden-xs.hidden-sm
- if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group)
- %a.js-promote-project-label-button.btn.btn-transparent.btn-action.has-tooltip{ title: _('Promote to Group Label'),
+ %button.js-promote-project-label-button.btn.btn-transparent.btn-action.has-tooltip{ title: _('Promote to Group Label'),
+ disabled: true,
+ type: 'button',
data: { url: promote_project_label_path(label.project, label),
label_title: label.title,
label_color: label.color,
label_text_color: label.text_color,
target: '#promote-label-modal',
container: 'body',
- toggle: 'modal' },
- disabled: true }
+ toggle: 'modal' } }
= sprite_icon('level-up')
- if can?(current_user, :admin_label, label)
= link_to edit_label_path(label), title: "Edit", class: 'btn btn-transparent btn-action', data: {toggle: "tooltip"} do