summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-11-07 19:58:17 +0000
committerRobert Speicher <robert@gitlab.com>2018-11-07 19:58:17 +0000
commit73b7709a95ebb8eff5452e3344dac7f8d369f77c (patch)
treecdc9c05b712eb85814ff853c41064a26a45d1762
parent3632a8ab8b697c0401addf76c6676361cc5396bc (diff)
parent8f779b0ed10a3b4c3ce87541d9aac7fed6924055 (diff)
downloadgitlab-ce-73b7709a95ebb8eff5452e3344dac7f8d369f77c.tar.gz
Merge branch 'ml-fix-create-merge-spec-qa' into 'master'
Fix e2e create merge request test Closes gitlab-org/quality/nightly#32 See merge request gitlab-org/gitlab-ce!22877
-rw-r--r--app/views/shared/empty_states/_labels.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/empty_states/_labels.html.haml b/app/views/shared/empty_states/_labels.html.haml
index 9133ce8ed22..bee26cd8312 100644
--- a/app/views/shared/empty_states/_labels.html.haml
+++ b/app/views/shared/empty_states/_labels.html.haml
@@ -8,7 +8,7 @@
%p= _("You can also star a label to make it a priority label.")
.text-center
- if can?(current_user, :admin_label, @project)
- = link_to _('New label'), new_project_label_path(@project), class: 'btn btn-success', title: _('New label'), id: 'new_label_link'
+ = link_to _('New label'), new_project_label_path(@project), class: 'btn btn-success qa-label-create-new', title: _('New label'), id: 'new_label_link'
= link_to _('Generate a default set of labels'), generate_project_labels_path(@project), method: :post, class: 'btn btn-success btn-inverted', title: _('Generate a default set of labels'), id: 'generate_labels_link'
- if can?(current_user, :admin_label, @group)
= link_to _('New label'), new_group_label_path(@group), class: 'btn btn-success', title: _('New label'), id: 'new_label_link'