Add latest changes from gitlab-org/gitlab@master

config/audit_events/types/security_policy_access_token_push_bypass.yml

@@ -0,0 +1,10 @@
+---
+name: security_policy_access_token_push_bypass
+description: Branch push that is blocked by a security policy is bypassed for configured access token
+introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/549644
+introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/196249
+feature_category: security_policy_management
+milestone: '18.2'
+saved_to_database: true
+scope: [Project]
+streamed: true

config/audit_events/types/security_policy_service_account_push_bypass.yml

@@ -0,0 +1,10 @@
+---
+name: security_policy_service_account_push_bypass
+description: Branch push that is blocked by a security policy is bypassed for configured service account
+introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/549644
+introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/196249
+feature_category: security_policy_management
+milestone: '18.2'
+saved_to_database: true
+scope: [Project]
+streamed: true

config/initializers/doorkeeper.rb

@@ -18,9 +18,9 @@ Doorkeeper.configure do
       # Ensure user is redirected to redirect_uri after login
       session[:user_return_to] = request.fullpath
 
-      namespace_path = request.query_parameters['top_level_namespace_path']
+      root_namespace_id = request.query_parameters['root_namespace_id']
 
-      resolver = Gitlab::Auth::OAuth::OauthResourceOwnerRedirectResolver.new(namespace_path)
+      resolver = Gitlab::Auth::OAuth::OauthResourceOwnerRedirectResolver.new(root_namespace_id)
       redirect_to(resolver.resolve_redirect_url)
       nil
     end