c546757cd1
Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream
2024-07-16 17:54:36 +02:00
aa88aca0ad
Add optional OAuth application to reports ( #30539 )
2024-07-16 13:23:08 +00:00
edec2e9fdf
Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream
2024-07-14 18:43:35 +02:00
35a437a03f
Destroy `NotificationRequest`s that are dismissed ( #31008 )
2024-07-12 12:09:52 +00:00
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
51f581e03e
Fix `Rails/ReversibleMigration` cop for `remove` ( #30833 )
2024-06-26 13:51:44 +00:00
528a7f57fa
Fix `Rails/ReversibleMigration` cop for `change_column` ( #30835 )
2024-06-26 13:51:11 +00:00
3b4607991d
Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream
2024-06-22 20:59:23 +02:00
4651c0cb39
Fix `Rails/ReversibleMigrationMethodDefinition` cop ( #30794 )
2024-06-21 14:43:12 +00:00
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
9e9613b286
Fix `mentions.account_id` and `mentions.status_id` not having `NOT NULL` database constraints ( #30591 )
2024-06-07 13:45:11 +00:00
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
e02d23b549
Change `read:me` scope to `profile` scope ( #30357 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-06 07:30:10 +00:00
974335e414
Add experimental server-side notification grouping ( #29889 )
2024-06-03 08:35:59 +00:00
c827a98f19
Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
128987eded
Add support for `fediverse:creator` OpenGraph tag ( #30398 )
2024-05-29 01:34:33 +02:00
20fdf8e22c
Merge commit '0a2110b9af52005798251dc9d245a66dd5dd20fa' into glitch-soc/merge-upstream
2024-05-20 17:47:48 +02:00
00cf8d3748
Change older Paperclip database migrations for consistency ( #30204 )
2024-05-20 14:59:27 +00:00
2bcbeed951
Add some error handling to OTP secret migration ( #30344 )
2024-05-20 14:59:23 +00:00
f35ba6963d
Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream
2024-05-11 22:10:56 +02:00
1959365c2f
Add missing `on_delete: :cascade` on `notification_policies` ( #30251 )
2024-05-10 20:00:25 +00:00
96fb6e491f
Revert "Migrate paperclip `_file_size` columns to bigint ( #29263 )" ( #30203 )
2024-05-07 08:46:05 +00:00
b152f936c1
Migrate paperclip `_file_size` columns to bigint ( #29263 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-06 15:05:12 +00:00
3789d9f825
Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
Switched to using upstream's implementation of the tests.
2024-05-04 16:28:30 +02:00
bac4026d80
Merge commit '85fdbd0ad53837c9209acf3fb45811d5bae41cd9' into glitch-soc/merge-upstream
2024-05-04 15:10:54 +02:00
1e7d5d2957
Update `devise-two-factor` to version 5.0.0 ( #28325 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-02 09:31:41 +00:00
eeefb7cdbc
Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream
2024-05-01 19:42:34 +02:00
360590ecd8
Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
2024-05-01 19:30:41 +02:00
7b46517c38
Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream
2024-05-01 14:31:14 +02:00
d9eee9bf9a
Remove column defaults for `status_pins` timestamp columns ( #29261 )
2024-04-24 14:56:54 +00:00
2ec9bff36e
Fix Rubocop `Rails/UniqueValidationWithoutIndex` cop ( #27461 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-22 08:04:05 +00:00
5915bd7f45
Fix development environment admin account not being auto-approved ( #29958 )
2024-04-16 17:30:32 +00:00
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
f2b23aa5f3
Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Upstream added a navigation item while glitch-soc had an additional one.
Ported upstream changes.
2024-04-06 19:35:21 +02:00
de740dfb9c
Use `upsert_all` and `insert_all` to reduce back-and-forth in costly migrations ( #29752 )
2024-03-26 15:57:08 +00:00
58376eedda
Remove obsolete `admin` and `moderator` columns from `users` table ( #29718 )
2024-03-22 16:22:36 +00:00
dfa43707eb
Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately ( #29714 )
2024-03-22 15:44:31 +00:00
70a8fcf07d
Fix notification policy migration not preserving `filter_private_mentions` correctly ( #29699 )
2024-03-21 21:52:29 +00:00
821fc53583
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 19:53:20 +01:00
954b470fbc
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 16:48:24 +00:00
d4449cc682
Fix account_relationship_severance_events unique indexes ( #29665 )
2024-03-20 16:08:34 +00:00
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00:00
a5127d0ef8
Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
glitch-soc has an extra `:destroy` action on notifications for historical reasons.
Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
5b3a8737d6
Add hints for rules ( #29539 )
2024-03-11 08:57:07 +00:00
e85a2aa18d
Fix interaction settings migration error when encountering no settings ( #29529 )
2024-03-08 09:10:07 +00:00
50b17f7e10
Add notification policies and notification requests ( #29366 )
2024-03-07 14:53:37 +00:00
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
2024-02-24 14:18:16 +01:00
Claire