luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-19 11:48:46 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/db
History
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
2023-02-25 14:00:40 +01:00
..
migrate Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
seeds Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307) 2023-01-18 16:33:03 +01:00
views
schema.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
seeds.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00