diff options
author | Francisco Javier López <fjlopez@gitlab.com> | 2017-12-14 12:25:32 +0100 |
---|---|---|
committer | Francisco Javier López <fjlopez@gitlab.com> | 2017-12-14 12:25:32 +0100 |
commit | ebfe269e848b13fb45f366ff1c953d8475f39ffa (patch) | |
tree | 90bd64252f7d7592eb49e80f81f2968a61434a71 | |
parent | a673d25d2d1af92b210e3f0b92c2122ad1470875 (diff) | |
download | gitlab-ce-ebfe269e848b13fb45f366ff1c953d8475f39ffa.tar.gz |
Resolving conflict
-rw-r--r-- | lib/api/groups.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index 92df001f942..a0f85c5bc3d 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -52,19 +52,21 @@ module API optional :sort, type: String, values: %w[asc desc], default: 'asc', desc: 'Sort by asc (ascending) or desc (descending)' use :pagination end - get do + + def find_groups(params) find_params = { all_available: params[:all_available], - owned: params[:owned], - custom_attributes: params[:custom_attributes] + custom_attributes: params[:custom_attributes], + owned: params[:owned] } + find_params[:parent] = find_group!(params[:id]) if params[:id] groups = GroupsFinder.new(current_user, find_params).execute groups = groups.search(params[:search]) if params[:search].present? groups = groups.where.not(id: params[:skip_groups]) if params[:skip_groups].present? groups = groups.reorder(params[:order_by] => params[:sort]) - present_groups params, groups + groups end def find_group_projects(params) @@ -98,7 +100,6 @@ module API get do groups = find_groups(params) present_groups params, groups ->>>>>>> 65b7a7a063... Merge branch 'sh-optimize-groups-api' into 'master' end desc 'Create a group. Available only for users who can create groups.' do |