Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.		2023-02-09 12:46:12 +01:00
..
base.rb	Add support for language preferences for trending statuses and links (#18288)	2022-10-08 16:45:40 +02:00
history.rb	Apply Rubocop Performance/BlockGivenWithExplicitBlock (#23441)	2023-02-08 10:36:23 +01:00
links.rb	Add support for language preferences for trending statuses and links (#18288)	2022-10-08 16:45:40 +02:00
preview_card_batch.rb
preview_card_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
preview_card_provider_batch.rb
preview_card_provider_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
query.rb
status_batch.rb	Fix using wrong policy on status-related actions in admin UI (#19490)	2022-10-28 00:48:30 +02:00
status_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
statuses.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
tag_batch.rb
tag_filter.rb
tags.rb	Change trending statuses to only show one status from each account (#18181)	2022-04-29 22:42:42 +02:00