diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
| commit | 93912f04988eab072a119a588342c68c5cdb52e0 (patch) | |
| tree | 815a69053ed9f1eb5e86e62735220a53bfcef814 /app/lib | |
| parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
| parent | d26c1cb2fe145b8d56a9c15e110a917e6f63068b (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/admin/system_check/sidekiq_process_check.rb | 1 | ||||
| -rw-r--r-- | app/lib/request.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/lib/admin/system_check/sidekiq_process_check.rb b/app/lib/admin/system_check/sidekiq_process_check.rb index 648811d6c..d577b3bf3 100644 --- a/app/lib/admin/system_check/sidekiq_process_check.rb +++ b/app/lib/admin/system_check/sidekiq_process_check.rb @@ -7,6 +7,7 @@ class Admin::SystemCheck::SidekiqProcessCheck < Admin::SystemCheck::BaseCheck mailers pull scheduler + ingress ).freeze def skip? diff --git a/app/lib/request.rb b/app/lib/request.rb index dd198f399..96d934a8f 100644 --- a/app/lib/request.rb +++ b/app/lib/request.rb @@ -281,7 +281,7 @@ class Request class ProxySocket < Socket class << self - def check_private_address(_address) + def check_private_address(_address, _host) # Accept connections to private addresses as HTTP proxies will usually # be on local addresses nil |