diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-08-17 23:16:01 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-18 22:16:32 +0300 |
| commit | d774ba35b75c6a32c798041febc517da879e0bd7 (patch) | |
| tree | 860a2a05409baf1e065d8e6461e4f1f5bcc6aca6 | |
| parent | 5a5c2d7722af5508b727040ce274e7761e457716 (diff) | |
Merge branch 'fix-issuable-filter' into 'master'
v8.11.0-rc4
Hide "Create new list button" on Issues and MRs pages
/cc @jschatz1
See merge request !5852
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index cb095063336..ee1a54d9f34 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -27,9 +27,7 @@ = render "shared/issuable/label_dropdown" .pull-right - - if controller.controller_name != 'boards' - = render 'shared/sort_dropdown' - - if can?(current_user, :admin_list, @project) + - if controller.controller_name == 'boards' && can?(current_user, :admin_list, @project) .dropdown %button.btn.btn-create.js-new-board-list{ type: "button", data: { toggle: "dropdown", labels: labels_filter_path, project_id: @project.try(:id) } } Create new list @@ -38,6 +36,8 @@ - if can?(current_user, :admin_label, @project) = render partial: "shared/issuable/label_page_create" = dropdown_loading + - else + = render 'shared/sort_dropdown' - if controller.controller_name == 'issues' .issues_bulk_update.hide |