diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2017-12-14 12:18:08 +0100 |
|---|---|---|
| committer | Francisco Javier López <fjlopez@gitlab.com> | 2017-12-14 12:18:08 +0100 |
| commit | a673d25d2d1af92b210e3f0b92c2122ad1470875 (patch) | |
| tree | cbaa5e737dbed2e5f516c64e4b9370179ecde504 | |
| parent | f798169cb8f7e9cac7a80caf702afd4940abc592 (diff) | |
| download | gitlab-ce-a673d25d2d1af92b210e3f0b92c2122ad1470875.tar.gz | |
Resolving conflict
| -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) |