monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app
History
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
..
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-02-09 12:46:12 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
mailers Add single splat to callback method definitions to avoid ArgumentError (#22246) 2022-12-13 20:03:16 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
presenters Add setting for status page URL (#23390) 2023-02-04 04:56:06 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2023-01-24 20:32:31 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00