Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-16 01:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Conflict due to glitch-soc having factored the file differently.
  Ported upstream's changes.
This commit is contained in:
Claire
2024-03-13 20:14:18 +01:00
parent 663dd49a85 a32a126cac
commit 65ca37bbaa
19 changed files with 109 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/lib/sanitize/config_spec.rb
View File

@@ -58,7 +58,7 @@ describe Sanitize::Config do
end
describe '::MASTODON_OUTGOING' do
subject { Sanitize::Config::MASTODON_OUTGOING }
subject { described_class::MASTODON_OUTGOING }
around do |example|
original_web_domain = Rails.configuration.x.web_domain