BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
9119c363
Commit
9119c363
authored
Dec 14, 2017
by
Francisco Javier López
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolving conflict
parent
ebfe269e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
23 deletions
+5
-23
groups.rb
lib/api/groups.rb
+5
-23
No files found.
lib/api/groups.rb
View file @
9119c363
...
...
@@ -25,24 +25,7 @@ module API
optional
:statistics
,
type:
Boolean
,
default:
false
,
desc:
'Include project statistics'
end
def
present_groups
(
groups
,
options
=
{})
options
=
options
.
reverse_merge
(
with:
Entities
::
Group
,
current_user:
current_user
)
groups
=
groups
.
with_statistics
if
options
[
:statistics
]
present
paginate
(
groups
),
options
end
end
resource
:groups
do
include
CustomAttributesEndpoints
desc
'Get a groups list'
do
success
Entities
::
Group
end
params
do
params
:group_list_params
do
use
:statistics_params
optional
:skip_groups
,
type:
Array
[
Integer
],
desc:
'Array of group ids to exclude from list'
optional
:all_available
,
type:
Boolean
,
desc:
'Show all group that you have access to'
...
...
@@ -76,12 +59,11 @@ module API
paginate
(
projects
)
end
def
present_groups
(
params
,
groups
)
options
=
{
def
present_groups
(
groups
,
options
=
{}
)
options
=
options
.
reverse_merge
(
with:
Entities
::
Group
,
current_user:
current_user
,
statistics:
params
[
:statistics
]
&&
current_user
.
admin?
}
current_user:
current_user
)
groups
=
groups
.
with_statistics
if
options
[
:statistics
]
present
paginate
(
groups
),
options
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment