Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
03137950
Commit
03137950
authored
May 20, 2019
by
Imre Farkas
Committed by
Lin Jen-Shin
May 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE port of Move EE specific lines in API::Groups
parent
5e2d1eb8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
14 deletions
+19
-14
lib/api/groups.rb
lib/api/groups.rb
+10
-14
lib/api/helpers/groups_helpers.rb
lib/api/helpers/groups_helpers.rb
+9
-0
No files found.
lib/api/groups.rb
View file @
03137950
...
@@ -20,20 +20,19 @@ module API
...
@@ -20,20 +20,19 @@ module API
optional
:share_with_group_lock
,
type:
Boolean
,
desc:
'Prevent sharing a project with another group within this group'
optional
:share_with_group_lock
,
type:
Boolean
,
desc:
'Prevent sharing a project with another group within this group'
end
end
if
Gitlab
.
ee?
params
:optional_params_ee
do
params
:optional_params_ee
do
optional
:membership_lock
,
type:
Boolean
,
desc:
'Prevent adding new members to project membership within this group'
end
optional
:ldap_cn
,
type:
String
,
desc:
'LDAP Common Name'
optional
:ldap_access
,
type:
Integer
,
desc:
'A valid access level'
params
:optional_update_params_ee
do
optional
:shared_runners_minutes_limit
,
type:
Integer
,
desc:
'(admin-only) Pipeline minutes quota for this group'
optional
:extra_shared_runners_minutes_limit
,
type:
Integer
,
desc:
'(admin-only) Extra pipeline minutes quota for this group'
all_or_none_of
:ldap_cn
,
:ldap_access
end
end
end
end
include
::
API
::
Helpers
::
GroupsHelpers
helpers
do
params
:optional_params
do
params
:optional_params
do
use
:optional_params_ce
use
:optional_params_ce
use
:optional_params_ee
if
Gitlab
.
ee?
use
:optional_params_ee
end
end
params
:statistics_params
do
params
:statistics_params
do
...
@@ -176,10 +175,7 @@ module API
...
@@ -176,10 +175,7 @@ module API
optional
:name
,
type:
String
,
desc:
'The name of the group'
optional
:name
,
type:
String
,
desc:
'The name of the group'
optional
:path
,
type:
String
,
desc:
'The path of the group'
optional
:path
,
type:
String
,
desc:
'The path of the group'
use
:optional_params
use
:optional_params
use
:optional_update_params_ee
if
Gitlab
.
ee?
optional
:file_template_project_id
,
type:
Integer
,
desc:
'The ID of a project to use for custom templates in this group'
end
end
end
put
':id'
do
put
':id'
do
group
=
find_group!
(
params
[
:id
])
group
=
find_group!
(
params
[
:id
])
...
...
lib/api/helpers/groups_helpers.rb
0 → 100644
View file @
03137950
# frozen_string_literal: true
module
API
module
Helpers
module
GroupsHelpers
extend
ActiveSupport
::
Concern
end
end
end
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