Noa Himesaka
d793cdab75
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-30 14:54:36 +09:00
Claire
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
2023-10-24 19:59:19 +02:00
Matt Jankowski
e93a75f1a1
Rails 7.1 update ( #25963 )
2023-10-23 17:58:29 +00:00
Noa Himesaka
9a41bb3bf7
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-07-31 15:42:20 +09:00
Claire
bd349cb850
Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
Eugen Rochko
4d01d1a1ee
Remove 16:9 cropping from web UI ( #26132 )
2023-07-24 13:46:55 +02:00
Jeremy Kescher
c6d04be51a
Migrate emoji reactions
2023-07-07 21:57:40 +02:00
Claire
3dcba94e68
Migrate glitch-soc's exclusive user settings
2023-03-31 22:50:57 +02:00
Eugen Rochko
a9b5598c97
Change user settings to be stored in a more optimal way ( #23630 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30 14:44:00 +02:00
