summaryrefslogtreecommitdiff
path: root/app/controllers/groups/application_controller.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-02-23 12:10:57 +0000
committerSean McGivern <sean@gitlab.com>2018-02-27 10:32:29 +0000
commit868cb4307f93b2f8fa0d25d9e47e632d0855881e (patch)
treec611b02f7bf745fadbd7eef47486aa9331fceaed /app/controllers/groups/application_controller.rb
parent58a312f5097b30a93100de93d06427402d514b48 (diff)
downloadgitlab-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/groups/application_controller.rb')
-rw-r--r--app/controllers/groups/application_controller.rb4
1 files changed, 0 insertions, 4 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