luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-18 11:28:51 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Claire abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did.
2023-04-22 10:06:11 +02:00
..
chewy Change algorithm of tootctl search deploy to improve performance (#18463) 2022-05-22 22:16:43 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-04-22 10:06:11 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2023-04-22 10:06:11 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2023-04-22 10:06:11 +02:00
lib Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
mailers Add user handle to notification mail recipient address (#24240) 2023-04-17 11:06:06 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-04-22 10:06:11 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
presenters Remove unused InstancePresenter methods (#24206) 2023-03-22 14:15:22 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2023-04-22 10:06:11 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-04-22 10:06:11 +02:00
validators Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2023-04-22 10:06:11 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-04-01 14:31:05 +02:00