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/controllers | |
| 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/controllers')
| -rw-r--r-- | app/controllers/groups/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/groups_controller.rb | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/app/controllers/groups/application_controller.rb b/app/controllers/groups/application_controller.rb index 4a2bfc1f887..9f3bb60b4cc 100644 --- a/app/controllers/groups/application_controller.rb +++ b/app/controllers/groups/application_controller.rb @@ -18,10 +18,6 @@ class Groups::ApplicationController < ApplicationController @projects ||= GroupProjectsFinder.new(group: group, current_user: current_user).execute end - def group_merge_requests - @group_merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id).execute - end - def authorize_admin_group! unless can?(current_user, :admin_group, group) return render_404 diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 14b9d6c22bd..283c3e5f1e0 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -14,7 +14,6 @@ class GroupsController < Groups::ApplicationController before_action :authorize_create_group!, only: [:new] before_action :group_projects, only: [:projects, :activity, :issues, :merge_requests] - before_action :group_merge_requests, only: [:merge_requests] before_action :event_filter, only: [:activity] before_action :user_actions, only: [:show, :subgroups] |