6281c4dedd
Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while glitch-soc
has a different version of the file overall.
Added upstream's changes.
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-19 19:13:32 +02:00
2391937e11
Fix follow recommendation moderation page default language when using regional variant ( #32580 )
2024-10-18 10:21:25 +00:00
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
d8eab3d81f
Reinforce coverage for `DomainBlock` model ( #32473 )
2024-10-14 12:51:01 +00:00
b0dd38433b
Fix follow recommendation suppressions not applying immediately ( #32392 )
2024-10-14 08:18:25 +00:00
d9fbb071da
Fix notification requests from suspended accounts still being listed ( #32354 )
2024-10-09 17:29:02 +00:00
258dce1256
Add `OpenSSL::SSL::SSLError` to http connection errors wrapper ( #32307 )
2024-10-08 14:59:51 +00:00
e8ec6667bd
Extract wrapper constant for `HTTP::*` error classes ( #32285 )
2024-10-08 13:53:35 +00:00
7e06d724c9
Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream
2024-10-07 20:45:07 +02:00
bfabd6a2b8
Move account suspension-related methods to concern ( #28351 )
2024-10-07 12:02:04 +00:00
b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
d95f6f4410
Extract `ExportSummary` class for account object counts ( #32227 )
2024-10-03 13:09:58 +00:00
36f9c96812
Clean up labels on development application form ( #32116 )
2024-10-02 14:45:12 +00:00
2151dfb8d6
Add `relevant_params` to ReportFilter (matches account filter) ( #32136 )
2024-10-02 13:24:40 +00:00
1f65a95421
Remove unneeded `reorder(nil)` conditions ( #32200 )
2024-10-02 12:26:16 +00:00
4aa26eba53
Extract `WebPushRequest` from push notification worker and subscription ( #32208 )
2024-10-02 11:11:52 +00:00
ec16ed37c3
Extract constants for header and avatar geometry ( #32151 )
2024-10-01 11:36:25 +00:00
e975b55c24
Remove `WebfingerHelper` module & move usage inline ( #31203 )
2024-10-01 09:54:42 +00:00
e6cda8388c
Move OTP secret length to configuration ( #32125 )
2024-10-01 09:38:42 +00:00
9af9ef6fb3
Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream
2024-09-30 13:04:19 +02:00
0c872beed4
Merge commit from fork
...
This should not change the set of words matched by `USERNAME_RE` but does
change the one matched by `MENTION_RE`. Indeed, the previous regexp allowed
a domain part to start with `.` or `-`, which the new regexp does not allow.
2024-09-30 12:25:54 +02:00
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
e02e88bff4
Use previously extracted model constants in form `maxlength` attributes ( #32113 )
2024-09-27 08:21:27 +00:00
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
d6f5ee75ab
Add notification grouping for follow notifications ( #32085 )
2024-09-25 13:36:19 +00:00
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
04a939d640
Add `reviewed` and `unreviewed` scopes to `Reviewable` model concern ( #31988 )
2024-09-20 08:51:37 +00:00
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
abd2f5654a
Add validation coverage for `CustomEmoji` shortcode value ( #31906 )
2024-09-16 07:53:03 +00:00
4b40d13cb3
Increase preview card image size limit from 2MB to 8MB when using libvips ( #31904 )
2024-09-14 00:16:02 +00:00
117ac13d12
Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream
2024-09-13 21:37:34 +02:00
c1b2c4fd9a
Strip protocol from attribution domains ( #31900 )
2024-09-13 11:37:15 +00:00
ba81e4e019
Fix inability to locally suspend remotely-suspended accounts in moderation interface ( #31899 )
2024-09-13 09:11:10 +00:00
a2c4f5f5c0
Add coverage for `ListAccount` follow/follow_request set up ( #31896 )
2024-09-13 08:49:03 +00:00
49cbee3836
Remove unused argument from `AccountMigration.within_cooldown` ( #31892 )
2024-09-13 08:43:21 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
8cdc148167
Handle invalid visibility ( #31571 )
2024-09-12 13:29:55 +00:00
17c57c46e7
Add coverage for title/limit validations in `List` model ( #31869 )
2024-09-12 13:25:23 +00:00
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
b240bad61a
Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream
2024-09-11 20:58:35 +02:00
da07adfe6c
Add `CustomEmoji.enabled` scope ( #31830 )
2024-09-10 13:21:40 +00:00
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00:00
5b995143f1
Use `with_options` for shared Account validation option value ( #31827 )
2024-09-10 08:03:45 +00:00
d0ab94c4d2
Add `FeaturedTag` coverage, use `pick` in model ( #31828 )
2024-09-09 19:57:19 +00:00
441af2632d
Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream
2024-09-09 18:22:41 +02:00
e6969cf4e4
Add method for media-referencing status in `AccountStatusCleanupPolicy` ( #31798 )
2024-09-09 08:33:51 +00:00
82161d8ae5
Change Account::Field parsing to use HTML5::DocumentFragment ( #31813 )
2024-09-08 18:56:18 +00:00
29124990a2
Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
2024-09-06 19:25:31 +02:00
c88ba523ee
Fix sort order of moderation notes on Reports and Accounts ( #31528 )
2024-09-06 14:58:36 +00:00
Claire
Matt Jankowski
David Roetzel
Renaud Chaput
Christian Schmidt
Eugen Rochko
Mike Dalessio
Emelia Smith