Claire
6fc9febb47
Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream
2025-09-05 20:03:42 +02:00
Matt Jankowski
3efba15b3c
Use pluck on DomainAllow.allowed_domains for export ( #36019 )
2025-09-05 12:30:18 +00:00
Claire
d5b959a2ca
Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some preferences to a new category, while glitch-soc had an
extra preference there.
Moved the extra preference like upstream did to the new category.
2025-09-02 19:07:51 +02:00
Claire
ab698ff521
Move posting defaults to their own preferences sub-category ( #35966 )
2025-09-01 08:31:07 +00:00
Claire
6abe6cdef5
Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream
2025-08-29 18:21:28 +02:00
Claire
8b7685d956
Add default quote policy to API ( #35948 )
2025-08-29 11:37:20 +00:00
Claire
8d602df786
Merge commit '72bd1ed4b3df9188a1ad3e664c86fe2e928bd134' into glitch-soc/merge-upstream
2025-08-18 13:44:06 +02:00
Claire
72bd1ed4b3
Fix updates to quote policy not being federated ( #35804 )
2025-08-18 08:34:45 +00:00
Claire
4d9150735a
Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
Updated the dependency as upstream did.
2025-08-17 20:52:34 +02:00
Claire
2648bbdc51
Add PUT /api/v1/statuses/:status_id/interaction_policy ( #35769 )
2025-08-13 15:51:16 +00:00
Matt Jankowski
5ee83a680b
Update stoplight to version 5.3.1 ( #35129 )
2025-08-12 08:15:22 +00:00
Matt Jankowski
61f0ce654f
Update rubocop-rails to version 2.33.0 ( #35741 )
2025-08-12 07:29:02 +00:00
Claire
11902d958f
Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Upstream added a new helper for a setting, where glitch-soc had extra ones.
Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
2025-08-09 23:02:43 +02:00
Matt Jankowski
b8982cb881
Use around_action to preserve stored location in auth/sessions#destroy ( #35716 )
2025-08-08 15:31:50 +00:00
Claire
235037a3b2
Merge commit 'ac59772dc6cda646258e61debfd792f9057c1c39' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Conflict because upstream added a parameter where glitch-soc had an extra one.
Added upstream's parameter while keeping glitch-soc's.
- `app/serializers/activitypub/note_serializer.rb`:
Conflict because upstream added an extension where glitch-soc had an extra one.
Added upstream's extension while keeping glitch-soc's.
- `app/services/update_status_service.rb`:
Conflict because upstream added a parameter where glitch-soc had an extra one.
Added upstream's parameter while keeping glitch-soc's.
2025-08-06 22:02:55 +02:00
Claire
9ec99ffef1
Add quote_approval_policy parameter when posting and editing statuses ( #35699 )
2025-08-06 14:23:12 +00:00
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
