VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-21 23:43:41 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2025-07-17 12:08:09 +00:00
parent b49ea2b72f
commit 9fe0324bb2
150 changed files with 1402 additions and 1337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/feature_flags/beta/filter_blob_path.yml
View File

@ -1,9 +0,0 @@
---
name: filter_blob_path
feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/499245
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/172997
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/505449
milestone: '17.7'
group: group::source code
type: beta
default_enabled: true

9
config/feature_flags/beta/your_work_groups_vue.yml
View File

@ -1,9 +0,0 @@
---
name: your_work_groups_vue
feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/502477
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/183596
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/542790
milestone: '17.10'
group: group::organizations
type: beta
default_enabled: false

19
config/initializers/trusted_proxies.rb
View File

@ -8,20 +8,29 @@
module Rack
class Request
def trusted_proxy?(ip)
Rails.application.config.action_dispatch.trusted_proxies.any? { |proxy| proxy === ip }
Rails.application.config.action_dispatch.trusted_proxies.any? { |proxy| proxy.include?(ip) }
rescue IPAddr::InvalidAddressError
false
end
end
end
gitlab_trusted_proxies = Array(Gitlab.config.gitlab.trusted_proxies).map do |proxy|
# Trust custom proxies from config.
trusted_proxies = Array(Gitlab.config.gitlab.trusted_proxies).map do |proxy|
IPAddr.new(proxy)
rescue IPAddr::InvalidAddressError
end.compact
end
Rails.application.config.action_dispatch.trusted_proxies = (
['127.0.0.1', '::1'] + gitlab_trusted_proxies)
# Default to private IPs if no proxies configured.
trusted_proxies = ActionDispatch::RemoteIp::TRUSTED_PROXIES if trusted_proxies.empty?
# Always trust localhost.
trusted_proxies += [IPAddr.new('127.0.0.1'), IPAddr.new('::1')]
# Trust all proxies in their IPv6 mapped format.
trusted_proxies += trusted_proxies.compact.select(&:ipv4?).map(&:ipv4_mapped)
Rails.application.config.action_dispatch.trusted_proxies = trusted_proxies.uniq
# A monkey patch to make trusted proxies work with Rails 5.0.
# Inspired by https://github.com/rails/rails/issues/5223#issuecomment-263778719