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
Emelia Smith
72f2f35bfb
Implement Instance Moderation Notes ( #31529 )
2025-06-25 08:15:44 +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
c023ebc87a
Limit count to pending&trending on admin/trends/tags page ( #35120 )
2025-06-23 13:30:12 +00:00
Claire
2c751a6a19
Merge commit 'c644413f8a068490ddb8038441e5b59112e8294e' into glitch-soc/merge-upstream
2025-06-16 20:08:52 +02:00
Matt Jankowski
ca3cc36549
Allow more flexible host/port treatment with LOCAL_DOMAIN values in tests ( #35040 )
2025-06-16 13:12:23 +00:00
Matt Jankowski
6f2aba989f
Move "limited federation mode" config to x.mastodon area ( #35041 )
2025-06-16 06:13:03 +00:00
Claire
7da6b07c75
Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream
2025-06-13 18:07:59 +02:00
Matt Jankowski
ab7f50ce4e
Reduce hard coding of LOCAL_DOMAIN env value throughout tests ( #35025 )
2025-06-13 07:58:22 +00:00
Claire
86a7a1ef3b
Merge commit '3aed93711c0118ab68fa09f4d3ac2635cb3344b8' into glitch-soc/merge-upstream
2025-06-11 22:52:21 +02:00
Claire
aa6d1d4ac1
Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream
2025-06-11 18:55:03 +02:00
Eugen Rochko
f53bb4cd7d
Add "More" to the sidebar menu with links to mutes, blocks, and so on ( #34987 )
2025-06-11 16:12:04 +00:00
Matt Jankowski
629bb74451
Replace selenium-webdriver with playwright ( #34867 )
2025-06-10 16:33:46 +00:00
Claire
2085b0b53a
Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
Not a real conflict, just glitch-soc code textually adjacent to code added
upstream.
2025-06-05 18:02:40 +02:00
Matt Jankowski
1d152d2181
Replace local vars with let in JS-enabled system specs ( #34905 )
2025-06-05 07:08:52 +00:00
Claire
b031f65670
Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream
2025-05-25 14:51:59 +02:00
Matt Jankowski
f1a6f4333a
Remove redis-namespace gem ( #34742 )
2025-05-21 15:20:17 +00:00
Claire
d7cb6068b1
Add ability to reorder server rules from admin interface ( #34737 )
2025-05-20 12:49:11 +00:00
Claire
5321a553d5
Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Not a real conflict, upstream added a setting on a line adjacent to a
glitch-soc-only line.
Added upstream's new setting.
2025-05-14 13:38:23 +02:00
Claire
aa04efb92a
Move server rule creation form to its own page ( #34637 )
2025-05-14 09:43:07 +00:00
Claire
4e6c7fba78
Merge commit '678c8dfeec2c221cf609b924161dc03cebfa41e1' into glitch-soc/merge-upstream
2025-04-10 17:50:04 +02:00
Matt Jankowski
de19af3650
Extract frontend_translations helper to support module ( #34400 )
2025-04-10 13:51:17 +00:00
Claire
f8b0f38636
Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream
2025-03-29 17:02:39 +01:00
Claire
a5eaa95bb2
Merge commit 'e28b64ac2dcd381f8b7e6bcfc2cc2b2ed3121cd9' into glitch-soc/merge-upstream
2025-03-28 18:48:04 +01:00
David Roetzel
97b9994743
Basic FASP support ( #34031 )
2025-03-28 12:16:40 +00:00
Matt Jankowski
dfa4a97dd8
Fix intermittent account note failure by removing disappearing content check ( #34296 )
2025-03-28 09:24:36 +00:00
Matt Jankowski
0479efdbb6
Fix intermittent failure on account note system spec ( #34295 )
2025-03-27 15:09:09 +00:00
Claire
9c5c86c947
Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream
2025-03-26 18:18:07 +01:00
Matt Jankowski
2a181f56e3
Convert settings/deletes spec controller->request/system ( #34274 )
2025-03-26 07:26:28 +00:00
Claire
e7498887a7
Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Upstream removed some code that somehow had been modified in glitch-soc.
Removed it as upstream did.
2025-03-24 20:06:25 +01:00
Claire
225b18e742
Add system spec for account notes ( #34206 )
2025-03-24 09:30:23 +00:00
Matt Jankowski
9d3daa847a
Convert filters/statuses spec controller->system/request ( #34232 )
2025-03-24 08:11:34 +00:00
Claire
f1fa6b3cd0
Merge commit '1960aac90b16fce1ec620ac990aa931efcf04700' into glitch-soc/merge-upstream
2025-03-22 15:41:48 +01:00
Matt Jankowski
a2981a0997
Convert admin/users/two_factor_authentications spec controller->system ( #34216 )
2025-03-21 07:41:38 +00:00
Matt Jankowski
469cfc5430
Convert admin/change_emails spec controller->system ( #34215 )
2025-03-21 07:40:29 +00:00
Matt Jankowski
0284e77e5f
Convert admin/action_logs spec controller->system ( #34214 )
2025-03-21 07:38:29 +00:00
Claire
971690caf2
Merge commit 'f7b1769e8a69e2831493f3a704d68efa5cf9beff' into glitch-soc/merge-upstream
2025-03-19 20:09:14 +01:00
Matt Jankowski
f7b1769e8a
Convert admin/dashboard spec controller->system ( #34208 )
2025-03-19 08:32:36 +00:00
Matt Jankowski
539a06f189
Convert admin/account_actions spec controller->system ( #34207 )
2025-03-19 08:20:16 +00:00
Claire
6f2979b0b0
Merge commit '547658f086b2bfb396f69822d7ba938e4c0caf80' into glitch-soc/merge-upstream
2025-03-18 22:03:50 +01:00
Matt Jankowski
795d465f8d
Convert disputes/strikes spec controller->request/system ( #34191 )
2025-03-18 08:18:36 +00:00
Claire
399fbf97de
Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream
2025-03-11 18:44:32 +01:00
Claire
420ffdfb62
Add delay to profile updates to debounce them ( #34137 )
2025-03-11 16:17:17 +00:00
Matt Jankowski
6d5a1fbe1d
Assert on page contents while progressing through new_statuses system spec ( #34139 )
2025-03-11 14:00:51 +00:00
Matt Jankowski
dc43699b77
Assert on page contents before reloading report for interface JS spec ( #34132 )
2025-03-11 09:14:16 +00:00
Claire
fb55d09f77
Merge commit 'fb34d9c5909116d586a0187d86ada36ee1234f61' into glitch-soc/merge-upstream
2025-03-10 19:48:45 +01:00
Matt Jankowski
e1f278cdf2
Convert admin/webhooks/secrets spec controller->system ( #34109 )
2025-03-10 08:17:48 +00:00
Matt Jankowski
7169b270ae
Convert admin/site_uploads spec controller->system ( #34108 )
2025-03-10 08:17:02 +00:00
Claire
4bea9a0a66
Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream
2025-03-07 18:34:27 +01:00
Claire
9d5a9123b9
Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream
2025-03-07 13:15:10 +01:00
