diff options
| author | Igor <idrozdov@gitlab.com> | 2019-03-08 02:55:45 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-03-08 02:55:45 +0300 |
| commit | 9745d0de2ff605a03e7fbb95d0f71279bbd4afa5 (patch) | |
| tree | 0d7f0f89b51199bf676988888539338086f419a3 /app/views | |
| parent | 90f4b6563d42ff7412de277682c0ecb7c25e41bb (diff) | |
Provide EE backports for filtering by approver feature
Adds custom validator for ArrayNoneAny param
Extracts some logic in js into separate files
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/_merge_requests.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_merge_requests.html.haml b/app/views/projects/merge_requests/_merge_requests.html.haml index bd6f1c05949..57fbd360d46 100644 --- a/app/views/projects/merge_requests/_merge_requests.html.haml +++ b/app/views/projects/merge_requests/_merge_requests.html.haml @@ -1,5 +1,5 @@ %ul.content-list.mr-list.issuable-list - - if @merge_requests.exists? + - if @merge_requests.present? = render @merge_requests - else = render 'shared/empty_states/merge_requests' diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index bdba47ed14d..f43be304e6b 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -71,6 +71,7 @@ = render 'shared/issuable/user_dropdown_item', user: User.new(username: '{{username}}', name: '{{name}}'), avatar: { lazy: true, url: '{{avatar_url}}' } + = render_if_exists 'shared/issuable/approver_dropdown' #js-dropdown-milestone.filtered-search-input-dropdown-menu.dropdown-menu %ul{ data: { dropdown: true } } %li.filter-dropdown-item{ data: { value: 'None' } } |