Claire
3f166bb068
Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream
2025-08-05 15:46:33 +02:00
Claire
1fd3510b32
Change the quote revocation REST API endpoint to return updated quote post ( #35677 )
2025-08-05 09:42:58 +00:00
Matt Jankowski
8131268256
Replace unprocessable_entity -> unprocessable_content ( #35658 )
2025-08-05 07:42:08 +00:00
Claire
dbab707d64
Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream
2025-08-01 22:11:59 +02:00
Claire
591df1f205
Add support for local quote stamps ( #35626 )
2025-08-01 14:55:25 +00:00
Claire
2dfdcc7dcb
Add API endpoints to view and revoke one's quoted posts ( #35578 )
2025-07-31 09:36:51 +00:00
Claire
e53421b548
Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Not a real conflict, upstream removed settings that are identical in glitch-soc
but textually adjacent to glitch-soc-only settings.
Removed what upstream removed.
2025-07-30 20:05:45 +02:00
Osman
39250ab961
Sort auditable accounts ( #35272 )
2025-07-30 15:08:05 +00:00
Matt Jankowski
139025fce0
Fix wrong policy authorization in admin controllers ( #35588 )
2025-07-30 13:17:53 +00:00
Matt Jankowski
fd779c25b9
Avoid return not_found in statuses controller ( #35585 )
2025-07-30 09:28:20 +00:00
Matt Jankowski
ece49baa38
Use generated query method for check in admin/domain_blocks ( #35589 )
2025-07-30 09:27:29 +00:00
Eugen Rochko
20bbd20ef1
Add ability to block words in usernames ( #35407 )
2025-07-29 10:19:15 +00:00
Eugen Rochko
8cf7a77808
Fix async refresh never being finished when status cannot be fetched ( #35500 )
2025-07-29 09:23:32 +00:00
Matt Jankowski
b464b87c2b
Use moved? query method where relevant ( #35542 )
2025-07-28 08:02:21 +00:00
Claire
8649681c51
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
Conflict because upstream added context extensions where glitch-soc had its own.
Added upstream's new context extension while keeping ours.
2025-07-25 21:45:00 +02:00
Claire
5a88b7f683
Add experimental basic quote post authoring ( #35355 )
2025-07-25 12:35:24 +00:00
Matt Jankowski
2e35defeec
Update rubocop to version 1.79.0 ( #35502 )
2025-07-25 07:22:05 +00:00
Claire
72affd6b45
Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream
...
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.
- `docker-compose.yml`:
Conflict because of upstream VS glitch-soc repos.
Updated version number as upstream did, but kept glitch-soc repos.
2025-07-24 18:10:38 +02:00
Matt Jankowski
5c01ccc31f
Set flash options via redirect where possible ( #35370 )
2025-07-24 08:03:28 +00:00
Matt Jankowski
e54e96d61f
Extract params hash for api/v1/push/subscriptions#create ( #35475 )
2025-07-24 07:49:20 +00:00
Matt Jankowski
4241ce9888
Silence json key duplicate warning from api/web/push_subscriptions ( #35481 )
2025-07-24 07:33:53 +00:00
Claire
63af7ecb1f
Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream
2025-07-23 18:43:56 +02:00
Eugen Rochko
14a781fa24
Add button to load new replies in web UI ( #35210 )
2025-07-23 13:42:07 +00:00
Matt Jankowski
d2ef9ac04a
Use report_range method in admin/tags to generate reporting period ( #35465 )
2025-07-23 08:02:07 +00:00
Matt Jankowski
d065ec9298
Combine assignment params in admin/accounts#batch action ( #35463 )
2025-07-23 07:59:14 +00:00
Matt Jankowski
b19131202f
Extract constants for captcha directives/sources ( #35439 )
2025-07-23 07:55:54 +00:00
Claire
5ff0039d7b
Merge commit 'fab95b8dae3db411318638804a01675dd5b38a01' into glitch-soc/merge-upstream
2025-07-22 23:17:48 +02:00
Matt Jankowski
fab95b8dae
Add coverage for api/v1/invites scenarios ( #35389 )
2025-07-21 14:17:53 +00:00
Claire
eeffe580d8
Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream
2025-07-15 18:19:32 +02:00
Matt Jankowski
30344d6abf
Confirm User#login_activities in auth/sessions spec ( #35372 )
2025-07-15 06:31:00 +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
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
Claire
e97f43399b
Fix error handling for blank actions in account moderation action form ( #35246 )
2025-07-03 14:42:48 +00:00
Claire
68b05e994f
Fix error on log-in from old users requiring ToS interstitial when said ToS has been removed ( #35233 )
2025-07-01 17:43:59 +00:00
Claire
2eec4da8fc
Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream
2025-06-30 17:52:22 +02:00
David Roetzel
ac4b735c67
Add FASP account search support ( #34033 )
2025-06-30 07:42:34 +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
Claire
0a7418e6d8
Change rule translation interface to display english name and populate empty translations ( #35170 )
2025-06-25 10:02:19 +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
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
Claire
9fccf0a8c6
Merge commit '6166e616389b051039dc76635048e2519271832a' into glitch-soc/merge-upstream
2025-06-24 20:45:46 +02:00
Matt Jankowski
fd902c04f7
Use config_for for omniauth enabled values ( #35015 )
2025-06-24 09:32:13 +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
8837fd8c54
Update rubocop to version 1.77.0 ( #35128 )
2025-06-23 07:40:11 +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
