diff options
author | Douwe Maan <douwe@gitlab.com> | 2019-04-04 12:23:39 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-04-04 12:23:39 +0300 |
commit | c115ac4fa55f709187f6634b07e3d4bd067ec787 (patch) | |
tree | 46f37e3890eb58d5d33c21382ccad792cf96ec7d /app | |
parent | 42f6b0250d9c82546e7d911a058ff3edb3f5068c (diff) | |
parent | e8da6255d93beed1ffa3f55587c12a85561f40b0 (diff) |
Merge branch '3314-add-on-runner-minutes-for-gitlab-com-ce' into 'master'
Backport some changes from gitlab-ee!9815
Closes #3314
See merge request gitlab-org/gitlab-ce!25908
Diffstat (limited to 'app')
-rw-r--r-- | app/services/groups/base_service.rb | 6 | ||||
-rw-r--r-- | app/services/groups/create_service.rb | 2 | ||||
-rw-r--r-- | app/services/groups/update_service.rb | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/app/services/groups/base_service.rb b/app/services/groups/base_service.rb index 8c8acce5ca5..019cd047ae9 100644 --- a/app/services/groups/base_service.rb +++ b/app/services/groups/base_service.rb @@ -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 diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb index 99ead467f74..74aad3b1c94 100644 --- a/app/services/groups/create_service.rb +++ b/app/services/groups/create_service.rb @@ -8,6 +8,8 @@ module Groups end def execute + remove_unallowed_params + @group = Group.new(params) after_build_hook(@group, params) diff --git a/app/services/groups/update_service.rb b/app/services/groups/update_service.rb index 787445180f0..73e1e00dc33 100644 --- a/app/services/groups/update_service.rb +++ b/app/services/groups/update_service.rb @@ -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]) |