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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
e8da6255
Commit
e8da6255
authored
Apr 02, 2019
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport some changes from EE
MR:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9815
parent
ccdf7a93
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
0 deletions
+11
-0
app/services/groups/base_service.rb
app/services/groups/base_service.rb
+6
-0
app/services/groups/create_service.rb
app/services/groups/create_service.rb
+2
-0
app/services/groups/update_service.rb
app/services/groups/update_service.rb
+1
-0
lib/api/groups.rb
lib/api/groups.rb
+1
-0
lib/api/users.rb
lib/api/users.rb
+1
-0
No files found.
app/services/groups/base_service.rb
View file @
e8da6255
...
...
@@ -7,5 +7,11 @@ module Groups
def
initialize
(
group
,
user
,
params
=
{})
@group
,
@current_user
,
@params
=
group
,
user
,
params
.
dup
end
private
def
remove_unallowed_params
# overridden in EE
end
end
end
app/services/groups/create_service.rb
View file @
e8da6255
...
...
@@ -8,6 +8,8 @@ module Groups
end
def
execute
remove_unallowed_params
@group
=
Group
.
new
(
params
)
after_build_hook
(
@group
,
params
)
...
...
app/services/groups/update_service.rb
View file @
e8da6255
...
...
@@ -6,6 +6,7 @@ module Groups
def
execute
reject_parent_id!
remove_unallowed_params
return
false
unless
valid_visibility_level_change?
(
group
,
params
[
:visibility_level
])
...
...
lib/api/groups.rb
View file @
e8da6255
...
...
@@ -26,6 +26,7 @@ module API
optional
:ldap_cn
,
type:
String
,
desc:
'LDAP Common Name'
optional
:ldap_access
,
type:
Integer
,
desc:
'A valid access level'
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
...
...
lib/api/users.rb
View file @
e8da6255
...
...
@@ -54,6 +54,7 @@ module API
if
Gitlab
.
ee?
optional
:shared_runners_minutes_limit
,
type:
Integer
,
desc:
'Pipeline minutes quota for this user'
optional
:extra_shared_runners_minutes_limit
,
type:
Integer
,
desc:
'(admin-only) Extra pipeline minutes quota for this user'
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