diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-08-17 20:16:01 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-17 15:20:27 -0500 |
| commit | 863f77b6633acafdbbe403fa803a529ce1d18603 (patch) | |
| tree | 22b0c4ab366833f14bc101834804bc907fc19be5 /app | |
| parent | 6505a994375e72ab7d400452d9f03dabcb7a0676 (diff) | |
| download | gitlab-ce-863f77b6633acafdbbe403fa803a529ce1d18603.tar.gz | |
Merge branch 'fix-issuable-filter' into 'master'
Hide "Create new list button" on Issues and MRs pages
/cc @jschatz1
See merge request !5852
Diffstat (limited to 'app')
| -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 |