Commit e8da6255 authored by Rubén Dávila's avatar Rubén Dávila
parent ccdf7a93
...@@ -7,5 +7,11 @@ module Groups ...@@ -7,5 +7,11 @@ module Groups
def initialize(group, user, params = {}) def initialize(group, user, params = {})
@group, @current_user, @params = group, user, params.dup @group, @current_user, @params = group, user, params.dup
end end
private
def remove_unallowed_params
# overridden in EE
end
end end
end end
...@@ -8,6 +8,8 @@ module Groups ...@@ -8,6 +8,8 @@ module Groups
end end
def execute def execute
remove_unallowed_params
@group = Group.new(params) @group = Group.new(params)
after_build_hook(@group, params) after_build_hook(@group, params)
......
...@@ -6,6 +6,7 @@ module Groups ...@@ -6,6 +6,7 @@ module Groups
def execute def execute
reject_parent_id! reject_parent_id!
remove_unallowed_params
return false unless valid_visibility_level_change?(group, params[:visibility_level]) return false unless valid_visibility_level_change?(group, params[:visibility_level])
......
...@@ -26,6 +26,7 @@ module API ...@@ -26,6 +26,7 @@ module API
optional :ldap_cn, type: String, desc: 'LDAP Common Name' optional :ldap_cn, type: String, desc: 'LDAP Common Name'
optional :ldap_access, type: Integer, desc: 'A valid access level' 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 :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 all_or_none_of :ldap_cn, :ldap_access
end end
end end
......
...@@ -54,6 +54,7 @@ module API ...@@ -54,6 +54,7 @@ module API
if Gitlab.ee? if Gitlab.ee?
optional :shared_runners_minutes_limit, type: Integer, desc: 'Pipeline minutes quota for this user' 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
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment