Commit 84b41f87 authored by Rémy Coutable's avatar Rémy Coutable

Resolve app/views/groups/labels/index.html.haml

Signed-off-by: Rémy Coutable's avatarRémy Coutable <remy@rymai.me>
parent b767eb01
- page_title 'Labels'
- can_admin_label = can?(current_user, :admin_label, @group)
<<<<<<< HEAD
- issuables = ['issues', 'merge requests'] + (@group&.feature_available?(:epics) ? ['epics'] : [])
=======
- hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1')
- issuables = ['issues', 'merge requests']
>>>>>>> upstream/master
- issuables = ['issues', 'merge requests'] + (@group&.feature_available?(:epics) ? ['epics'] : [])
- search = params[:search]
- if can_admin_label
......@@ -30,12 +26,8 @@
.labels-container.prepend-top-5
- if @labels.any?
.other-labels
<<<<<<< HEAD
%h5 Labels
=======
- if can_admin_label
%h5{ class: ('hide' if hide) } Labels
>>>>>>> upstream/master
%ul.content-list.manage-labels-list.js-other-labels
= render partial: 'shared/label', subject: @group, collection: @labels, as: :label, locals: { use_label_priority: false }
= paginate @labels, theme: 'gitlab'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment