diff options
| -rw-r--r-- | lib/api/groups.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index f0e44941b25..92df001f942 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -64,10 +64,7 @@ module API groups = groups.where.not(id: params[:skip_groups]) if params[:skip_groups].present? groups = groups.reorder(params[:order_by] => params[:sort]) -<<<<<<< HEAD - present_groups groups, statistics: params[:statistics] && current_user.admin? -======= - groups + present_groups params, groups end def find_group_projects(params) |