diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/discussions/_resolve_all.html.haml | 8 | ||||
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/app/views/discussions/_resolve_all.html.haml b/app/views/discussions/_resolve_all.html.haml deleted file mode 100644 index 689a22acd27..00000000000 --- a/app/views/discussions/_resolve_all.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -%resolve-discussion-btn{ ":discussion-id" => "'#{discussion.id}'", - ":merge-request-id" => discussion.noteable.iid, - ":can-resolve" => discussion.can_resolve?(current_user), - "inline-template" => true } - .btn-group{ role: "group", "v-if" => "showButton" } - %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading", "v-cloak" => "true" } - = icon("spinner spin", "v-show" => "loading") - {{ buttonText }} diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index a27ceaff782..d9ca0b8869f 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -159,6 +159,8 @@ = render_if_exists 'shared/issuable/filter_weight', type: type + = render_if_exists 'shared/issuable/filter_epic', type: type + %button.clear-search.hidden{ type: 'button' } = icon('times') .filter-dropdown-container.d-flex.flex-column.flex-md-row |