diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-27 10:06:26 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-27 10:06:26 +0000 |
| commit | 2850efcdd51909a5a92f844e7b8940ed0190d234 (patch) | |
| tree | a835f17e725eb7af63ea1ed09c34894adbe74128 /app | |
| parent | 5e56890e31d40c9ac47991d1d454f44f4ee5b0c2 (diff) | |
| parent | 69129f11df7aa738bfed7a84eead6fdf5d25a814 (diff) | |
| download | gitlab-ce-2850efcdd51909a5a92f844e7b8940ed0190d234.tar.gz | |
Merge branch '35191-prioritized-labels-for-non-member' into 'master'
Remove help message about prioritized labels for non-members
Closes #35191
See merge request !12912
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/labels/index.html.haml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml index d02ea5cccc3..4b9da02c6b8 100644 --- a/app/views/projects/labels/index.html.haml +++ b/app/views/projects/labels/index.html.haml @@ -1,6 +1,7 @@ - @no_container = true - page_title "Labels" - hide_class = '' +- can_admin_label = can?(current_user, :admin_label, @project) - if show_new_nav? && can?(current_user, :admin_label, @project) - content_for :breadcrumbs_extra do @@ -12,15 +13,17 @@ %div{ class: container_class } .top-area.adjust .nav-text - Labels can be applied to issues and merge requests. Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging. + Labels can be applied to issues and merge requests. + - if can_admin_label + Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging. - .nav-controls{ class: ("visible-xs" if show_new_nav?) } - - if can?(current_user, :admin_label, @project) + - if can_admin_label + .nav-controls{ class: ("visible-xs" if show_new_nav?) } = link_to new_project_label_path(@project), class: "btn btn-new" do New label .labels - - if can?(current_user, :admin_label, @project) + - if can_admin_label -# Only show it in the first page - hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1') .prioritized-labels{ class: ('hide' if hide) } @@ -33,7 +36,7 @@ - if @labels.present? .other-labels - - if can?(current_user, :admin_label, @project) + - if can_admin_label %h5{ class: ('hide' if hide) } Other Labels %ul.content-list.manage-labels-list.js-other-labels = render partial: 'shared/label', subject: @project, collection: @labels, as: :label |