mastodon/lib
Claire 6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
2024-11-24 16:46:28 +01:00
..
action_dispatch
active_record Update Rails to version 7.2.2 (#30391) 2024-11-07 14:58:20 +00:00
assets
chewy
devise/strategies
elasticsearch
generators/post_deployment_migration
linter
mastodon Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream 2024-11-24 16:46:28 +01:00
paperclip Fix uploading higher-than-wide GIF profile picture with libvips enabled (#32911) 2024-11-15 15:35:30 +00:00
rails
redis
sanitize_ext Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 2024-10-06 16:07:58 +02:00
simple_navigation
stoplight
tasks Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream 2024-11-24 16:46:28 +01:00
templates/haml/scaffold
terrapin
webpacker
exceptions.rb Fix `min_id` and `max_id` causing error in search API (#32857) 2024-11-18 09:37:01 +00:00
premailer_bundled_asset_strategy.rb
public_file_server_middleware.rb