diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-14 09:11:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-14 09:11:52 +0300 |
| commit | f68755eb58d59ffdd9fa5e0aff2e530c7e88298d (patch) | |
| tree | 7a54889a275d81cb615a6e98619d36e9f1324299 /app/controllers | |
| parent | 6d79f3f0c590c8e7ff6da63e46cbe9370d64bbcc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/membership_actions.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/concerns/membership_actions.rb b/app/controllers/concerns/membership_actions.rb index f660419375e..b4f5589a059 100644 --- a/app/controllers/concerns/membership_actions.rb +++ b/app/controllers/concerns/membership_actions.rb @@ -5,7 +5,6 @@ module MembershipActions extend ActiveSupport::Concern def update - update_params = params.require(root_params_key).permit(:access_level, :expires_at) member = members_and_requesters.find(params[:id]) result = Members::UpdateService .new(current_user, update_params) @@ -148,6 +147,10 @@ module MembershipActions membershipable.requesters end + def update_params + params.require(root_params_key).permit(:access_level, :expires_at) + end + def requested_relations(inherited_permissions = :with_inherited_permissions) case params[inherited_permissions].presence when 'exclude' |