Skip to content

Commit c934396

Browse files
committed
Merge branch '53816-empty-label-menu-if-not-logged-in' into 'master'
Resolve "Empty label menu if not logged in" Closes #53816 See merge request gitlab-org/gitlab-ce!23042
2 parents a7a524d + 70a18ed commit c934396

File tree

2 files changed

+28
-22
lines changed

2 files changed

+28
-22
lines changed

app/views/shared/_label.html.haml

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,29 @@
2323
%li.inline
2424
= link_to edit_label_path(label), class: 'btn btn-transparent label-action edit has-tooltip', title: _('Edit'), data: { placement: 'bottom' }, aria_label: _('Edit') do
2525
= sprite_icon('pencil')
26-
%li.inline
27-
.dropdown
28-
%button{ type: 'button', class: 'btn btn-transparent js-label-options-dropdown label-action', data: { toggle: 'dropdown' }, aria_label: _('Label actions dropdown') }
29-
= sprite_icon('ellipsis_v')
30-
.dropdown-menu.dropdown-open-left
31-
%ul
32-
- if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group)
33-
%li
34-
%button.js-promote-project-label-button.btn.btn-transparent.btn-action{ disabled: true, type: 'button',
35-
data: { url: promote_project_label_path(label.project, label),
36-
label_title: label.title,
37-
label_color: label.color,
38-
label_text_color: label.text_color,
39-
group_name: label.project.group.name,
40-
target: '#promote-label-modal',
41-
container: 'body',
42-
toggle: 'modal' } }
43-
= _('Promote to group label')
44-
- if can?(current_user, :admin_label, label)
45-
%li
46-
%span{ data: { toggle: 'modal', target: "#modal-delete-label-#{label.id}" } }
47-
%button.text-danger.remove-row{ type: 'button' }= _('Delete')
26+
- if can?(current_user, :admin_label, label)
27+
%li.inline
28+
.dropdown
29+
%button{ type: 'button', class: 'btn btn-transparent js-label-options-dropdown label-action', data: { toggle: 'dropdown' }, aria_label: _('Label actions dropdown') }
30+
= sprite_icon('ellipsis_v')
31+
.dropdown-menu.dropdown-open-left
32+
%ul
33+
- if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group)
34+
%li
35+
%button.js-promote-project-label-button.btn.btn-transparent.btn-action{ disabled: true, type: 'button',
36+
data: { url: promote_project_label_path(label.project, label),
37+
label_title: label.title,
38+
label_color: label.color,
39+
label_text_color: label.text_color,
40+
group_name: label.project.group.name,
41+
target: '#promote-label-modal',
42+
container: 'body',
43+
toggle: 'modal' } }
44+
= _('Promote to group label')
45+
- if can?(current_user, :admin_label, label)
46+
%li
47+
%span{ data: { toggle: 'modal', target: "#modal-delete-label-#{label.id}" } }
48+
%button.text-danger.remove-row{ type: 'button' }= _('Delete')
4849
- if current_user
4950
%li.inline.label-subscription
5051
- if can_subscribe_to_label_in_different_levels?(label)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Removes promote to group label for anonymous user
3+
merge_request: 23042
4+
author: Jacopo Beschi @jacopo-beschi
5+
type: fixed

0 commit comments

Comments
 (0)