mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/spec/models/concerns/account
History
Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
 		2024-05-01 19:30:41 +02:00
..
counters_spec.rb Use Rails `upsert` to generate update_count! query in Counters concern (#28738) 2024-04-17 08:16:51 +00:00
finder_concern_spec.rb Model concerns organization into module namespaces (#28149) 2023-12-01 11:00:41 +00:00
interactions_spec.rb Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream 2024-03-11 17:29:07 +01:00
statuses_search_spec.rb Model concerns organization into module namespaces (#28149) 2023-12-01 11:00:41 +00:00