diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-13 12:21:33 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-13 12:21:33 -0500 |
| commit | 4c0beb6c024b25ff24c7c2ea966bacab0ee860d5 (patch) | |
| tree | f3e61556a1cc9132f439d222dca9d6366eb8a6ca /app/views/shared/issuable/_label_page_default.html.haml | |
| parent | 2d58626a33bc0d4e78eaf0c25965d18a6239fa3b (diff) | |
| parent | 33010da28b0f2e00e96cc4bf6c439363905a81d5 (diff) | |
| download | gitlab-ce-4c0beb6c024b25ff24c7c2ea966bacab0ee860d5.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'app/views/shared/issuable/_label_page_default.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_label_page_default.html.haml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/views/shared/issuable/_label_page_default.html.haml b/app/views/shared/issuable/_label_page_default.html.haml index e8feff32d26..ad031e6af80 100644 --- a/app/views/shared/issuable/_label_page_default.html.haml +++ b/app/views/shared/issuable/_label_page_default.html.haml @@ -8,20 +8,19 @@ - if show_boards_content .issue-board-dropdown-content %p - Create lists from the labels you use in your project. Issues with that - label will automatically be added to the list. + Create lists from labels. Issues with that label appear in that list. = dropdown_filter(filter_placeholder) = dropdown_content - - if @project && show_footer + - if current_board_parent && show_footer = dropdown_footer do %ul.dropdown-footer-list - - if can?(current_user, :admin_label, @project) + - if can?(current_user, :admin_label, current_board_parent) %li %a.dropdown-toggle-page{ href: "#" } Create new label %li - = link_to project_labels_path(@project), :"data-is-link" => true do - - if show_create && @project && can?(current_user, :admin_label, @project) + = link_to labels_path, :"data-is-link" => true do + - if show_create && can?(current_user, :admin_label, current_board_parent) Manage labels - else View labels |