diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-02-23 12:10:57 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-02-27 10:32:29 +0000 |
| commit | 868cb4307f93b2f8fa0d25d9e47e632d0855881e (patch) | |
| tree | c611b02f7bf745fadbd7eef47486aa9331fceaed /app/views/groups/merge_requests.html.haml | |
| parent | 58a312f5097b30a93100de93d06427402d514b48 (diff) | |
| download | gitlab-ce-868cb4307f93b2f8fa0d25d9e47e632d0855881e.tar.gz | |
Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroups
Previously, these wouldn't count issues or MRs in subgroups - meaning that if
_this_ group had no issues or MRs, we'd show the empty state, which was wrong.
Diffstat (limited to 'app/views/groups/merge_requests.html.haml')
| -rw-r--r-- | app/views/groups/merge_requests.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index 046b92bd9fb..520fe217ae1 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -3,7 +3,7 @@ - content_for :page_specific_javascripts do = webpack_bundle_tag 'common_vue' -- if @group_merge_requests.empty? +- if group_merge_requests_count(state: 'all').zero? = render 'shared/empty_states/merge_requests', project_select_button: true - else .top-area |