Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot
2024-12-11 15:27:34 +00:00
parent e34c22f2ec
commit 65963de2ae
128 changed files with 1523 additions and 553 deletions

View File

@ -117,7 +117,7 @@ Rails.application.configure do
end
config.middleware.insert_before(
ActionDispatch::Cookies, Gitlab::Middleware::StripCookies, paths: [%r{^/assets/}, %r{^/v2$}, %r{^/v2/}]
ActionDispatch::Cookies, Gitlab::Middleware::StripCookies, paths: [%r{^/assets/}]
)
config.log_level = Gitlab::Utils.to_rails_log_level(ENV["GITLAB_LOG_LEVEL"], :debug)

View File

@ -1,7 +1,5 @@
# frozen_string_literal: true
require 'gitlab/middleware/strip_cookies'
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb
@ -77,8 +75,4 @@ Rails.application.configure do
config.action_mailer.raise_delivery_errors = true
config.eager_load = true
config.middleware.insert_before(
ActionDispatch::Cookies, Gitlab::Middleware::StripCookies, paths: [%r{^/v2$}, %r{^/v2/}]
)
end

View File

@ -14,9 +14,7 @@ Rails.application.configure do
config.middleware.insert_before(ActionDispatch::Static, Gitlab::Testing::RobotsBlockerMiddleware)
config.middleware.insert_before(ActionDispatch::Static, Gitlab::Testing::RequestInspectorMiddleware)
config.middleware.insert_before(ActionDispatch::Static, Gitlab::Testing::ClearProcessMemoryCacheMiddleware)
config.middleware.insert_before(
ActionDispatch::Cookies, Gitlab::Middleware::StripCookies, paths: [%r{^/assets/}, %r{^/v2$}, %r{^/v2/}]
)
config.middleware.insert_before(ActionDispatch::Cookies, Gitlab::Middleware::StripCookies, paths: [%r{^/assets/}])
Gitlab::Testing::ActionCableBlocker.install