From f68755eb58d59ffdd9fa5e0aff2e530c7e88298d Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sat, 14 Oct 2023 06:11:52 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/controllers/concerns/membership_actions.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

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'
-- 
cgit v1.2.3