diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-28 19:38:32 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-28 08:46:59 +0200 |
| commit | 924a6b7d33a245845071894de8d46d77bd44b52e (patch) | |
| tree | 1771c05a31b1bf41784c33d1bb1aa2e19ef25268 /app/controllers/admin | |
| parent | 9a28756c07f0f73bd134385bf11b44527ee81631 (diff) | |
| download | gitlab-ce-924a6b7d33a245845071894de8d46d77bd44b52e.tar.gz | |
New AccessRequestsFinder
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/groups_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/projects_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index aed77d0358a..aa7570cd896 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -10,7 +10,7 @@ class Admin::GroupsController < Admin::ApplicationController def show @members = @group.members.order("access_level DESC").page(params[:members_page]) - @requesters = @group.requesters + @requesters = AccessRequestsFinder.new(@group).execute(current_user) @projects = @group.projects.page(params[:projects_page]) end diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index 0d2f4f6eb38..1d963bdf7d5 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -22,7 +22,7 @@ class Admin::ProjectsController < Admin::ApplicationController end @project_members = @project.members.page(params[:project_members_page]) - @requesters = @project.requesters + @requesters = AccessRequestsFinder.new(@project).execute(current_user) end def transfer |