Claire
eeffe580d8
Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream
2025-07-15 18:19:32 +02:00
Claire
d36bf3b6fb
Fix support for quote verification in implicit status updates ( #35384 )
2025-07-15 15:36:12 +00:00
Claire
594976a538
Refactor ActivityPub::Activity::Accept and ActivityPub::Activity::Reject specs ( #35382 )
2025-07-15 13:18:37 +00:00
Matt Jankowski
0efb889a9c
Extract constant for attribution domains limit in account ( #35350 )
2025-07-15 13:08:24 +00:00
Matt Jankowski
30344d6abf
Confirm User#login_activities in auth/sessions spec ( #35372 )
2025-07-15 06:31:00 +00:00
Matt Jankowski
1637297085
Add coverage for CustomFilterStatus model ( #35374 )
2025-07-15 06:28:40 +00:00
Matt Jankowski
dec1fb71f4
Add coverage for FollowRecommendationMute model ( #35376 )
2025-07-15 06:27:36 +00:00
Claire
ad38168b77
Merge commit '7273f6c03cfc7fb74cc29ca9df610d1efb16417d' into glitch-soc/merge-upstream
2025-07-14 20:50:55 +02:00
Matt Jankowski
7273f6c03c
Move shared params to common method in admin/reports/actions ( #35353 )
2025-07-14 09:23:18 +00:00
Matt Jankowski
a3ffd2edf8
Use sequence for unique names on webauthn cred fabricator ( #35356 )
2025-07-14 09:20:50 +00:00
Claire
1716f8da71
Merge commit '3b52dca4057560c58b260433722d91650fcd5040' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream added a `features` attribute where glitch-soc had extra ones.
Added `features` like upstream did.
2025-07-11 18:53:47 +02:00
Matt Jankowski
1496488771
Add Status#not_replying_to_account scope for annual report classes ( #35257 )
2025-07-10 07:35:04 +00:00
Matt Jankowski
f9beecb343
Improve Accounts CLI prune spec ( #35302 )
2025-07-10 07:23:09 +00:00
Matt Jankowski
4ecfbd3920
Add Status.only_polls (and without polls) scope ( #35330 )
2025-07-10 07:13:22 +00:00
Claire
e2a867507c
Merge commit 'e9170e2de1d75e02f04ad39f2af131c70189fb50' into glitch-soc/merge-upstream
2025-07-10 01:10:32 +02:00
Claire
8bd2c87399
Fix support for special characters in various environment variables ( #35314 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online >
2025-07-09 08:58:41 +00:00
Claire
3efc857fbc
Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream
2025-07-08 16:41:01 +02:00
David Roetzel
8ee6cee36e
Better error response to malformed headers ( #35278 )
2025-07-08 09:31:04 +00:00
Matt Jankowski
bdffdcb12f
Remove unused scopes in Account model ( #35276 )
2025-07-07 08:07:01 +00:00
David Roetzel
1fa72d6c44
Raise better exception on FASP error responses ( #35262 )
2025-07-04 07:25:42 +00:00
Matt Jankowski
e8d2432e6a
Fix intermittent failure of TOS model spec from effective date collision ( #35244 )
2025-07-03 16:28:47 +00:00
Claire
e97f43399b
Fix error handling for blank actions in account moderation action form ( #35246 )
2025-07-03 14:42:48 +00:00
Matt Jankowski
1ae3510ede
Add coverage for TOS interstitial interruption flow of web app controller concern ( #35235 )
2025-07-02 09:21:32 +00:00
Matt Jankowski
c047014214
Add coverage for valid_locale_or_nil languages helper method ( #34866 )
2025-07-02 07:34:42 +00: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
Matt Jankowski
c023ebc87a
Limit count to pending&trending on admin/trends/tags page ( #35120 )
2025-06-23 13:30:12 +00:00
Matt Jankowski
b08ccaa5b3
Extract Account::Mappings concern from "interactions" ( #35119 )
2025-06-23 12:02:14 +00:00
Claire
9cb5a77c3e
Merge commit 'ac039d5f1323c46062d004896996f50549bfa38b' into glitch-soc/merge-upstream
2025-06-21 22:59:04 +02:00
David Roetzel
adf812efb3
Fix missing terms of services link ( #35115 )
2025-06-21 08:59:47 +00:00
Matt Jankowski
54f9a1b43b
Extract secret size constants in Webhook model ( #35104 )
2025-06-20 10:05:24 +00:00
Matt Jankowski
e9b1c1edfe
Simplify WebauthnCredential constant limit math ( #35107 )
2025-06-20 10:04:14 +00:00
