Claire
c475623418
Merge commit 'dc6d8f882528803c06b2a71c23d6c1467880a7e1' into glitch-soc/merge-4.4
2025-09-23 18:10:55 +02:00
Claire
0b66bd591f
Fix getting Create and Update out of order ( #36176 )
2025-09-22 16:54:04 +02:00
Claire
19c89f1bbd
Merge commit 'c966d756007e0e4c4eb020055c999e4cf7a07ed0' into glitch-soc/merge-4.4
2025-09-16 14:14:05 +02:00
Claire
48f55e3224
Fix quote posts with CW and no text being rejected
...
Fixes #36077
2025-09-12 16:27:29 +02:00
Claire
00c61317d3
Merge remote-tracking branch 'upstream/stable-4.4' into HEAD
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's theming system.
Updated the line as upstream did.
2025-09-04 18:33:21 +02:00
fiona
c0f9e7f4c3
Fix handling of edited status with new media and no text ( #35970 )
2025-09-04 10:45:54 +02:00
Matt Jankowski
97f118013a
Include update in the resources args for api/web/push_subscriptions route ( #35801 )
2025-09-04 10:45:54 +02:00
Claire
ea5d1f0297
Fix tootctl admin create not bypassing reserved username checks ( #35779 )
2025-09-04 10:45:54 +02:00
Matt Jankowski
7a862d3308
First pass coverage addition for antispam class ( #35771 )
2025-09-04 10:45:54 +02:00
Echo
1675eab561
Redirect on success for standalone compose ( #35763 )
2025-09-04 10:45:54 +02:00
Claire
5f4116a311
Fix interaction policy changes in implicit updates not being saved ( #35751 )
2025-09-04 10:45:54 +02:00
Claire
0741381670
Add test for Delete of inlined QuoteAuthorization ( #35724 )
2025-09-04 10:45:54 +02:00
Claire
fcb7917344
Merge commit '208cb8276ae618aa36aec5fad0dc31341402c133' into glitch-soc/merge-4.4
...
Conflicts:
- `app/models/trends/statuses.rb`:
Conflict because of glitch-soc's setting to allow CWs in trends.
Kept glitch-soc's setting but followed upstream's refactor.
2025-08-04 21:48:37 +02:00
Claire
208cb8276a
Fix friends-of-friends recommendations suggesting already-requested accounts ( #35604 )
2025-08-01 11:34:27 +02:00
Claire
8242f06eca
Add restrictions on which quote posts can trend ( #35507 )
2025-08-01 11:34:27 +02:00
Claire
6ff4e83937
Change quote verification to not bypass authorization flow for mentions ( #35528 )
2025-08-01 11:34:27 +02:00
Claire
e69c1479a8
Merge commit '77d2cdb30230ae6292bd247f6c6f97d00bd38084' into glitch-soc/backports-4.4
2025-07-23 18:10:05 +02:00
Claire
da0cc0f5b9
Fix support for quote verification in implicit status updates ( #35384 )
2025-07-23 16:08:43 +02:00
Claire
7ae78b1032
Refactor ActivityPub::Activity::Accept and ActivityPub::Activity::Reject specs ( #35382 )
2025-07-23 16:08:43 +02:00
Claire
ec6f93ae45
Merge commit '609a40181e0f3f505707d196985dfb78ab3b3f88' into glitch-soc/merge-4.4
2025-07-09 17:31:28 +02:00
Claire
1151b05c2d
Fix support for special characters in various environment variables ( #35314 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online >
2025-07-09 17:16:57 +02:00
Claire
bd442485d0
Merge commit '333a17a478f0ddcee4115a50f01077cb1dc5c22e' into glitch-soc/merge-4.4
2025-07-08 13:13:07 +02:00
David Roetzel
333a17a478
Better error response to malformed headers ( #35278 )
2025-07-08 11:45:24 +02:00
Matt Jankowski
b4a950c2fc
Remove unused scopes in Account model ( #35276 )
2025-07-07 17:48:13 +02:00
Claire
385dd5ea37
Merge commit '0c5ce23ae496af26b96aaab742800af93f552f44' into glitch-soc/merge-4.4
2025-07-04 17:56:10 +02:00
David Roetzel
7051458467
Raise better exception on FASP error responses ( #35262 )
2025-07-04 15:10:17 +02:00
Matt Jankowski
025abf7325
Fix intermittent failure of TOS model spec from effective date collision ( #35244 )
2025-07-04 15:10:17 +02:00
Claire
42884d8727
Fix error handling for blank actions in account moderation action form ( #35246 )
2025-07-04 15:10:17 +02:00
Matt Jankowski
961c22a6fd
Add coverage for TOS interstitial interruption flow of web app controller concern ( #35235 )
2025-07-04 15:10:17 +02:00
Matt Jankowski
041bce9ed6
Add coverage for valid_locale_or_nil languages helper method ( #34866 )
2025-07-04 15:10:17 +02:00
Claire
2eec4da8fc
Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream
2025-06-30 17:52:22 +02:00
David Roetzel
c357a7f8d6
Add optional bulk mailer settings ( #35203 )
2025-06-30 14:49:14 +00:00
David Roetzel
bae258925c
Persist follow recommendations from FASP ( #35218 )
2025-06-30 13:39:36 +00:00
Claire
153af19f55
Add specs for PublicFileServer middleware ( #35219 )
2025-06-30 11:23:11 +00:00
Matt Jankowski
964916c71b
Add coverage for TermsOfService scopes/validations ( #35204 )
2025-06-30 10:28:14 +00:00
David Roetzel
ac4b735c67
Add FASP account search support ( #34033 )
2025-06-30 07:42:34 +00:00
Claire
f7b4580b49
Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a file, glitch-soc had extra files.
Took upstream's changes and moved glitch-soc's additions at the end.
2025-06-26 18:04:37 +02:00
David Roetzel
48451b782d
Move email env var reading to yml files ( #35191 )
2025-06-26 12:18:30 +00:00
Claire
2e0a00ab46
Fix search operators sometimes getting lost ( #35190 )
2025-06-26 10:35:49 +00:00
Claire
c9a1e27a49
Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
glitch-soc had extra paths under `app/javascript/flavours`, but upstream
added `app/javascript` as a whole, so updated to upstream's.
2025-06-25 19:29:09 +02:00
Matt Jankowski
8285194451
Move layout setup for OAuth views to controllers ( #35176 )
2025-06-25 13:26:17 +00:00
Emelia Smith
72f2f35bfb
Implement Instance Moderation Notes ( #31529 )
2025-06-25 08:15:44 +00:00
Matt Jankowski
47fda2df2c
Update OAuth inflection to match spec ( #35160 )
2025-06-25 07:52:30 +00:00
Matt Jankowski
377289c961
Add coverage for doorkeeper model extensions ( #35161 )
2025-06-25 07:50:20 +00:00
Matt Jankowski
f852da50f6
Add User#email_domain method to extract domain from email address ( #35159 )
2025-06-25 07:22:19 +00:00
Claire
93bdb16817
Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
Conflict due to glitch-soc having modified specs ages ago.
The covered code is the same as upstream, though.
Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
Conflict because glitch-soc tests for an extra glitch-soc-specific
method.
Added upstream's changes while keeping the glitch-soc method.
2025-06-24 22:43:43 +02:00
Matt Jankowski
fd902c04f7
Use config_for for omniauth enabled values ( #35015 )
2025-06-24 09:32:13 +00:00
Matt Jankowski
0338733531
Add model coverage and scopes to RuleTranslation class ( #35098 )
2025-06-24 07:44:50 +00:00
Matt Jankowski
0d7f1584bc
Move remaining _map method specs from account to mappings spec ( #35142 )
2025-06-24 07:40:24 +00:00
Matt Jankowski
36f01af6c4
Add Status#only_reblogs scope for annual report classes ( #35141 )
2025-06-24 06:54:55 +00:00
