Claire
7b46517c38
Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream
2024-05-01 14:31:14 +02:00
Matt Jankowski
d9eee9bf9a
Remove column defaults for `status_pins` timestamp columns ( #29261 )
2024-04-24 14:56:54 +00:00
Matt Jankowski
2ec9bff36e
Fix Rubocop `Rails/UniqueValidationWithoutIndex` cop ( #27461 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-22 08:04:05 +00:00
Claire
5915bd7f45
Fix development environment admin account not being auto-approved ( #29958 )
2024-04-16 17:30:32 +00:00
Claire
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
Claire
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
Claire
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
Claire
de740dfb9c
Use `upsert_all` and `insert_all` to reduce back-and-forth in costly migrations ( #29752 )
2024-03-26 15:57:08 +00:00
Claire
58376eedda
Remove obsolete `admin` and `moderator` columns from `users` table ( #29718 )
2024-03-22 16:22:36 +00:00
Claire
dfa43707eb
Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately ( #29714 )
2024-03-22 15:44:31 +00:00
Claire
70a8fcf07d
Fix notification policy migration not preserving `filter_private_mentions` correctly ( #29699 )
2024-03-21 21:52:29 +00:00
Claire
821fc53583
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 19:53:20 +01:00
Claire
954b470fbc
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 16:48:24 +00:00
Claire
d4449cc682
Fix account_relationship_severance_events unique indexes ( #29665 )
2024-03-20 16:08:34 +00:00
Claire
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00:00
Claire
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
Eugen Rochko
5b3a8737d6
Add hints for rules ( #29539 )
2024-03-11 08:57:07 +00:00
Eugen Rochko
e85a2aa18d
Fix interaction settings migration error when encountering no settings ( #29529 )
2024-03-08 09:10:07 +00:00
Eugen Rochko
50b17f7e10
Add notification policies and notification requests ( #29366 )
2024-03-07 14:53:37 +00:00
Claire
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
Claire
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
Claire
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
2024-02-24 14:18:16 +01:00
Matt Jankowski
245064bb98
Move "everyone" role and "instance actor" account magic number IDs to constants ( #29260 )
2024-02-19 11:09:43 +00:00
Matt Jankowski
1e0b0a3486
Use SQL heredoc on long statement lines in migrations ( #29112 )
2024-02-06 16:42:25 +00:00
Matt Jankowski
dedefdc303
Move length value mapping to constant in ids to bigints migration ( #29048 )
2024-02-06 11:40:24 +00:00
Matt Jankowski
0bec5c0755
Remove migration base class switcher from `RailsSettingsMigration` ( #29047 )
2024-02-06 09:56:24 +00:00
Eugen Rochko
fa0ba67753
Change materialized views to be refreshed concurrently to avoid locks ( #29015 )
2024-01-30 18:21:30 +00:00
Claire
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
Eugen Rochko
5b1eb09d54
Add annual reports for accounts ( #28693 )
2024-01-24 09:38:10 +00:00
Claire
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
2024-01-18 22:16:16 +01:00
Matt Jankowski
f0b93ab02f
Use AR `database_version` in PG version checks in migrations ( #28804 )
2024-01-18 16:11:50 +00:00
Claire
08304075be
Fix old glitch-soc migration using removed `add_column_with_default` helper
2024-01-11 13:26:17 +01:00
Claire
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
2024-01-11 13:24:20 +01:00
Claire
630b245bb4
Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
Removed upstream, while glitch-soc had a change related to its theming system.
Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
Claire
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
Matt Jankowski
ea1c0feb86
Remove `add_column_with_default` migration helper ( #28654 )
2024-01-10 10:35:06 +00:00
gunchleoc
173953c23e
Fix ISO code for Canadian French ( #26015 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 10:56:13 +00:00
Matt Jankowski
ae39bed95b
Solve remaining `db/*migrate*` cops ( #28579 )
2024-01-04 16:40:28 +00:00
Claire
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
2024-01-04 09:07:05 +00:00
Claire
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
2024-01-03 20:52:19 +01:00
Matt Jankowski
51d2b80ff7
Solve `Abc/*` metrics for `db/*migrate*` files ( #28568 )
2024-01-03 13:22:03 +00:00
Claire
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
2023-12-28 16:57:10 +01:00
Claire
f2eb5038a6
Fix linting warning in glitch-soc-only migration
2023-12-21 19:25:12 +01:00
Claire
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
2023-12-21 19:24:10 +01:00
Claire
077e0c6812
Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict caused by the `json` gem thing once again.
Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored a bunch of specs, including one place that differs
because of glitch-soc's theming system.
Refactored as upstream did, adapting it for glitch-soc's theming system.
2023-12-20 22:16:50 +01:00
Eugen Rochko
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-19 10:59:43 +00:00
Claire
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
Claire
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
Matt Jankowski
3e336fe706
Opt out of `Rails/SkipsModelValidations` cop in db/migrate ( #28371 )
2023-12-15 14:38:12 +00:00
Matt Jankowski
469ee2ae36
Fix `Style/HashEachMethods` cop ( #28173 )
2023-12-01 16:07:19 +00:00
Eugen Rochko
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
2023-11-13 09:58:28 +00:00
Matt Jankowski
c501d626e8
Fix `Rails/BulkChangeTable` cop ( #26890 )
2023-11-06 16:15:48 +00:00
Claire
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
Matt Jankowski
bcd0171e5e
Fix `Lint/UselessAssignment` cop ( #27472 )
2023-10-19 16:55:06 +02:00
Matt Jankowski
a1b27d8b61
Fix `Naming/VariableNumber` cop ( #27447 )
2023-10-18 14:26:22 +02:00
Claire
b57ec6ad6b
Fix some settings not being properly migrated when set to `false`
2023-09-21 15:17:44 +02:00
Claire
f05985f8ec
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
2023-09-21 15:12:00 +02:00
Claire
890e334703
Add migration tests for negative settings ( #27012 )
2023-09-21 12:33:30 +02:00
Claire
6a9e93ae19
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:32:48 +02:00
Claire
abcc0b38fa
Fix incorrect PostgreSQL version check ( #26979 )
2023-09-19 17:31:58 +02:00
Claire
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
Claire
81caafbe84
Fix performances of profile directory ( #26842 )
2023-09-07 18:55:25 +02:00
Claire
77caba3789
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-05 20:34:17 +02:00
Claire
cab4cbfa5c
Fix “Scoped order is ignored, it's forced to be batch order.” warnings ( #26793 )
2023-09-05 15:37:23 +02:00
Claire
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-04 18:27:46 +02:00
Claire
cddef4c485
Fix language settings for users having selected the `kmr` language ( #26787 )
2023-09-04 17:56:31 +02:00
Claire
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
ac2dae0d11
Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
2023-09-02 13:50:16 +02:00
Claire
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
2023-09-01 17:47:07 +02:00
Claire
1471be8225
Fix `AddUniqueIndexOnPreviewCardsStatuses` migration requiring PostgreSQL 12+ in some cases ( #26737 )
2023-08-31 15:47:30 +02:00
Claire
1b5d3fdc5e
Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream
2023-08-24 20:55:28 +02:00
Claire
2126812f65
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
2023-08-22 18:31:28 +02:00
Claire
7e25e311d5
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
2023-08-21 21:07:39 +02:00
Claire
ee702e36e5
Change follow recommendation materialized view to be faster in most cases ( #26545 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-08-18 18:20:55 +02:00
Claire
90ec88d58b
Add support for `indexable` attribute on remote actors ( #26485 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 18:54:51 +02:00
Claire
8c7f3c5332
Remove old non-unique index on preview_cards statuses join table ( #26447 )
2023-08-14 09:38:08 +02:00
Claire
6530f9709c
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +02:00
Claire
ea8802a05a
Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream
2023-08-12 09:36:38 +02:00
Claire
44a5f1b64a
Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
Upstream updated its README, but glitch-soc has a completely different one.
Kept glitch-soc's README
2023-08-11 22:15:41 +02:00
Matt Jankowski
271d384fd0
Use migration classes in migrations where current definition conflicts with older ( #26390 )
2023-08-09 11:26:42 +02:00
Claire
4773d7b9aa
Fix `preview_cards_statuses_pkey` not being reindexed concurrently ( #26384 )
2023-08-08 11:41:53 +02:00
Christian Schmidt
8da99ffb0d
Add alt text for preview card thumbnails ( #26184 )
2023-08-03 15:41:51 +02:00
Claire
6b896b20cc
Add primary key to preview_cards_statuses join table (includes deduplication migration) ( #25243 )
2023-08-03 11:12:52 +02:00
Claire
425d77f812
Fix crash in `tootctl status remove` and some old migrations ( #26210 )
2023-08-02 20:54:56 +02:00
Claire
454d8567d4
Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream
2023-07-30 15:54:34 +02: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
Claire
b2515feb29
Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream
2023-07-30 14:33:28 +02:00
Matt Jankowski
a2dca50ef3
Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration ( #26178 )
2023-07-26 09:49:15 +02:00
Eugen Rochko
7bd8ef355c
Add `published_at` attribute to preview cards ( #26153 )
2023-07-25 13:40:35 +02:00
Christian Schmidt
3abe0fc5c8
Use valid email address for first account ( #26114 )
2023-07-23 15:58:19 +02:00
Claire
2d09653d50
Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb:
Upstream added an `include` where we had an extra `include` due to
glitch-soc's theming system.
Added upstream's new `include`.
2023-07-13 13:35:15 +02:00
Matt Jankowski
ce43ed144c
Rails 7.0 update ( #25668 )
2023-07-13 09:36:07 +02:00
Claire
9ae60f8738
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
2023-07-12 16:03:05 +02:00
Matt Jankowski
b8b2470cf8
Fix `Style/SlicingWithRange` cop ( #25923 )
2023-07-12 10:03:06 +02:00
Nick Schonning
1d557305d2
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
2023-07-12 09:47:08 +02:00
Claire
5de49e74d4
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
Claire
12fa24a885
Fix forgotten unconfirmed_email migration file ( #25702 )
2023-07-04 11:25:29 +02:00
Claire
e6a8faae81
Add users index on unconfirmed_email ( #25672 )
2023-07-02 19:41:35 +02:00
Claire
933ba1a3eb
Add superapp index on `oauth_applications` ( #25670 )
2023-07-02 16:56:16 +02:00
Claire
44e98a2740
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00