luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-31 17:46:54 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/api
History
Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Not a real conflict, just upstream getting rid of unused constants too close
  to glitch-soc-specific contents.
  Removed unused constants like upstream did.
- `app/models/trends.rb`:
  Conflict because glitch-soc disabled email notifications for trending links.
  Upstream has refactored this quite a bit and added trending posts.
  Took upstream code, but disabling the extra trending stuff will come in
  another commit.
- `app/views/admin/trends/links/index.html.haml`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes accordingly.
2022-02-26 09:29:23 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
v2 Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
web Add policy param to POST /api/v1/push/subscriptions (#16040) 2021-04-15 05:00:25 +02:00
base_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
oembed_controller_spec.rb