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

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

Browse Source 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules.
This commit is contained in:
Claire
2023-12-17 23:04:16 +01:00
parent c8fe36c349 f476d9dab2
commit 4113fbf6e8
136 changed files with 761 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/lib/feed_manager_spec.rb
View File

@@ -10,7 +10,7 @@ RSpec.describe FeedManager do
end
end
it 'tracks at least as many statuses as reblogs', skip_stub: true do
it 'tracks at least as many statuses as reblogs', :skip_stub do
expect(FeedManager::REBLOG_FALLOFF).to be <= FeedManager::MAX_ITEMS
end