Jeremy Kescher
b58bc7102e
Merge branch 'upstream-stable/4.3' into stable/4.3
2024-11-01 17:03:17 +01:00
Claire
2b0410f903
Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-18 17:19:57 +02:00
Claire
d728fa9991
Fix follow recommendation moderation page default language when using regional variant ( #32580 )
2024-10-18 15:49:26 +02:00
Claire
b091e531a5
Merge commit '49b3d5692e6f217e6506674ad8a623a4ba8d0c5f' into glitch-soc/backports-4.3
2024-10-15 17:42:22 +02:00
Claire
192e9d16eb
Fix follow recommendation suppressions not applying immediately ( #32392 )
2024-10-15 11:57:59 +02:00
Claire
b40adb4a89
Merge commit 'f99da81ef8b14a851347503d4177f83322c16d9a' into glitch-soc/stable-4.3
2024-10-14 19:18:08 +02:00
Claire
e5e0144957
Fix notification requests from suspended accounts still being listed ( #32354 )
2024-10-14 13:14:38 +02:00
Jeremy Kescher
9090719153
Merge remote-tracking branch 'refs/remotes/upstream/stable-4.3' into develop
2024-10-10 22:57:13 +02:00
Claire
dfe851b476
Merge branch 'stable-4.3' into glitch-soc/backports-4.3
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
2024-10-05 20:45:05 +02:00
Matt Jankowski
5c72b46a4e
Clean up labels on development application form ( #32116 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
7de8d5ffca
Add relevant_params to ReportFilter (matches account filter) ( #32136 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
74291dfb77
Remove unneeded reorder(nil) conditions ( #32200 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
f07707a9bb
Extract WebPushRequest from push notification worker and subscription ( #32208 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
1e19242134
Extract constants for header and avatar geometry ( #32151 )
2024-10-04 17:48:03 +02:00
Matt Jankowski
66ef4b9984
Remove WebfingerHelper module & move usage inline ( #31203 )
2024-10-04 17:48:03 +02:00
David Roetzel
ce2481a81b
Move OTP secret length to configuration ( #32125 )
2024-10-04 17:48:03 +02:00
Jeremy Kescher
1290a5609d
Merge branch 'glitch-v4.3.0-rc.1' into develop
2024-10-03 22:25:40 +02:00
Claire
9af9ef6fb3
Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream
2024-09-30 13:04:19 +02:00
Claire
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
Claire
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
Matt Jankowski
e02e88bff4
Use previously extracted model constants in form maxlength attributes ( #32113 )
2024-09-27 08:21:27 +00:00
Claire
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
Renaud Chaput
d6f5ee75ab
Add notification grouping for follow notifications ( #32085 )
2024-09-25 13:36:19 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Jeremy Kescher
655d28f6a7
Merge remote-tracking branch 'upstream/main' into develop
...
Also apply "Make addReaction and removeReaction optional props", therefore:
Co-authored by: Essem <smswessem@gmail.com>
2024-09-20 11:53:07 +02:00
Matt Jankowski
04a939d640
Add reviewed and unreviewed scopes to Reviewable model concern ( #31988 )
2024-09-20 08:51:37 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
Claire
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
Matt Jankowski
abd2f5654a
Add validation coverage for CustomEmoji shortcode value ( #31906 )
2024-09-16 07:53:03 +00:00
Claire
4b40d13cb3
Increase preview card image size limit from 2MB to 8MB when using libvips ( #31904 )
2024-09-14 00:16:02 +00:00
Claire
117ac13d12
Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream
2024-09-13 21:37:34 +02:00
David Roetzel
c1b2c4fd9a
Strip protocol from attribution domains ( #31900 )
2024-09-13 11:37:15 +00:00
Claire
ba81e4e019
Fix inability to locally suspend remotely-suspended accounts in moderation interface ( #31899 )
2024-09-13 09:11:10 +00:00
Matt Jankowski
a2c4f5f5c0
Add coverage for ListAccount follow/follow_request set up ( #31896 )
2024-09-13 08:49:03 +00:00
Matt Jankowski
49cbee3836
Remove unused argument from AccountMigration.within_cooldown ( #31892 )
2024-09-13 08:43:21 +00:00
Claire
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
Christian Schmidt
8cdc148167
Handle invalid visibility ( #31571 )
2024-09-12 13:29:55 +00:00
Matt Jankowski
17c57c46e7
Add coverage for title/limit validations in List model ( #31869 )
2024-09-12 13:25:23 +00:00
Claire
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
Claire
b240bad61a
Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream
2024-09-11 20:58:35 +02:00
Jeremy Kescher
0b66cfbc8d
Merge remote-tracking branch 'upstream/main' into develop
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-09-10 16:15:59 +02:00
Matt Jankowski
da07adfe6c
Add CustomEmoji.enabled scope ( #31830 )
2024-09-10 13:21:40 +00:00
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00:00
Matt Jankowski
5b995143f1
Use with_options for shared Account validation option value ( #31827 )
2024-09-10 08:03:45 +00:00
Matt Jankowski
d0ab94c4d2
Add FeaturedTag coverage, use pick in model ( #31828 )
2024-09-09 19:57:19 +00:00
Claire
441af2632d
Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream
2024-09-09 18:22:41 +02:00
Matt Jankowski
e6969cf4e4
Add method for media-referencing status in AccountStatusCleanupPolicy ( #31798 )
2024-09-09 08:33:51 +00:00
Mike Dalessio
82161d8ae5
Change Account::Field parsing to use HTML5::DocumentFragment ( #31813 )
2024-09-08 18:56:18 +00:00
Claire
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
Emelia Smith
c88ba523ee
Fix sort order of moderation notes on Reports and Accounts ( #31528 )
2024-09-06 14:58:36 +00:00
