Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 5 insertions, 6 deletions

diff --git a/app/controllers/google_api/authorizations_controller.rb b/app/controllers/google_api/authorizations_controller.rb
index 5080ee5fbbe..536c5e347e7 100644
--- a/app/controllers/google_api/authorizations_controller.rb
+++ b/app/controllers/google_api/authorizations_controller.rb
@@ -48,14 +48,13 @@ module GoogleApi
     end
 
     def redirect_uri_from_session
-      strong_memoize(:redirect_uri_from_session) do
-        if params[:state].present?
-          session[session_key_for_redirect_uri(params[:state])]
-        else
-          nil
-        end
+      if params[:state].present?
+        session[session_key_for_redirect_uri(params[:state])]
+      else
+        nil
       end
     end
+    strong_memoize_attr :redirect_uri_from_session
 
     def session_key_for_redirect_uri(state)
       GoogleApi::CloudPlatform::Client.session_key_for_redirect_uri(state)