diff options
| author | Jacopo <beschi.jacopo@gmail.com> | 2016-11-27 11:33:15 +0100 |
|---|---|---|
| committer | jacopo-beschi-intersail <jacopo.beschi@intersail.it> | 2016-12-05 18:06:36 +0100 |
| commit | 4d26ab28a955885cfe8ae08917395cc7fc252ebf (patch) | |
| tree | 145986b6be738530d967864ae1ae981eccc16463 /app/views/layouts/nav/_group.html.haml | |
| parent | 90c0f610e29976608dbfeeb63bc4763982c5dbc3 (diff) | |
| download | gitlab-ce-4d26ab28a955885cfe8ae08917395cc7fc252ebf.tar.gz | |
Fix Archived project merge requests add to group's Merge Requests
counter
This is done by:
- Extending the IssuableFinder adding the non_archived option to the params
- Overriding the #filter_params in the MergeRequestsAction
- Passing the non_archived param in the nav/_group.html.haml navbar
partial from the groups/merge_requests.html.haml
Diffstat (limited to 'app/views/layouts/nav/_group.html.haml')
| -rw-r--r-- | app/views/layouts/nav/_group.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml index f7edb47b666..f3539fd372d 100644 --- a/app/views/layouts/nav/_group.html.haml +++ b/app/views/layouts/nav/_group.html.haml @@ -31,7 +31,7 @@ = link_to merge_requests_group_path(@group), title: 'Merge Requests' do %span Merge Requests - - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute + - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened', non_archived: true).execute %span.badge.count= number_with_delimiter(merge_requests.count) = nav_link(controller: [:group_members]) do = link_to group_group_members_path(@group), title: 'Members' do |