diff options
author | Rémy Coutable <remy@rymai.me> | 2018-09-05 16:43:53 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-09-05 16:43:53 +0000 |
commit | 6967fd0aa5ba3ca51d48335e16703d12e6bd247c (patch) | |
tree | d415c1d246a3d42d6e28bbb46bc231874fa8cd37 /app | |
parent | f6097cbfaa1fae7cceef583bb3dbbd85286c80c2 (diff) | |
parent | 0ce39d4556a3ba1e5e9e75fb32f1bacc54354986 (diff) | |
download | gitlab-ce-6967fd0aa5ba3ca51d48335e16703d12e6bd247c.tar.gz |
Merge branch 'dz-cleanup-group-labels-page' into 'master'
Remove unnecessary logic from group labels page
See merge request gitlab-org/gitlab-ce!21518
Diffstat (limited to 'app')
-rw-r--r-- | app/views/groups/labels/index.html.haml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/views/groups/labels/index.html.haml b/app/views/groups/labels/index.html.haml index d63ef477177..e6821009d03 100644 --- a/app/views/groups/labels/index.html.haml +++ b/app/views/groups/labels/index.html.haml @@ -1,7 +1,6 @@ - @no_container = true - page_title "Labels" - can_admin_label = can?(current_user, :admin_label, @group) -- hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1') - issuables = ['issues', 'merge requests'] - search = params[:search] @@ -27,8 +26,7 @@ .labels-container.prepend-top-5 - if @labels.any? .other-labels - - if can_admin_label - %h5{ class: ('hide' if hide) } Labels + %h5= _('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 } = paginate @labels, theme: 'gitlab' |