Commit 6967fd0a authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'dz-cleanup-group-labels-page' into 'master'

Remove unnecessary logic from group labels page

See merge request gitlab-org/gitlab-ce!21518
parents f6097cbf 0ce39d45
- @no_container = true - @no_container = true
- page_title "Labels" - page_title "Labels"
- can_admin_label = can?(current_user, :admin_label, @group) - can_admin_label = can?(current_user, :admin_label, @group)
- hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1')
- issuables = ['issues', 'merge requests'] - issuables = ['issues', 'merge requests']
- search = params[:search] - search = params[:search]
...@@ -27,8 +26,7 @@ ...@@ -27,8 +26,7 @@
.labels-container.prepend-top-5 .labels-container.prepend-top-5
- if @labels.any? - if @labels.any?
.other-labels .other-labels
- if can_admin_label %h5= _('Labels')
%h5{ class: ('hide' if hide) } Labels
%ul.content-list.manage-labels-list.js-other-labels %ul.content-list.manage-labels-list.js-other-labels
= render partial: 'shared/label', subject: @group, collection: @labels, as: :label, locals: { use_label_priority: false } = render partial: 'shared/label', subject: @group, collection: @labels, as: :label, locals: { use_label_priority: false }
= paginate @labels, theme: 'gitlab' = 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