Claire
487c814eb9
Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Glitch-soc allows a wider range of HTML than upstream.
Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
added it there too.
2026-05-22 19:43:42 +02:00
David Roetzel
dee85c6df9
Only preload accounts in Collections when needed ( #39143 )
2026-05-22 10:11:41 +00:00
David Roetzel
e18ca373eb
Revert "Add partial accounts to collections endpoint ( #38919 )" ( #39128 )
2026-05-21 13:45:09 +00:00
Claire
42ec9a607b
Merge commit 'c26003af215da7696e2b0dcece7fa695b1be8871' into glitch-soc/merge-upstream
2026-05-18 19:35:08 +02:00
Pia B.
07a05e1edf
Add batch remove for collections in reports ( #39020 )
2026-05-18 14:53:40 +00:00
David Roetzel
db304735bf
Temporary tweak to account background refresh ( #39062 )
2026-05-18 10:04:28 +00:00
Claire
808b7a858d
Merge commit '8bbde181db0d6d79018fb1754a8296e753d47415' into glitch-soc/merge-upstream
2026-05-13 18:42:04 +02:00
David Roetzel
8bbde181db
Use the same condition for stale refresh ( #39026 )
2026-05-13 14:57:25 +00:00
Pia B.
7c05f56fe8
Add batch actions to collections and possibility to report multiple collections ( #38991 )
2026-05-12 16:13:01 +00:00
Claire
99f0a03dec
Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream
2026-05-07 18:26:17 +02:00
David Roetzel
11803e3d04
Relax uniqueness constraint to allow nil ( #38934 )
2026-05-07 10:08:50 +00:00
Claire
49310aeecf
Merge commit '1a2038775c0a999024a615348fcba6240e27b0fa' into glitch-soc/merge-upstream
2026-05-06 21:00:32 +02:00
David Roetzel
f6f45c43a9
Add partial accounts to collections endpoint ( #38919 )
2026-05-06 15:08:26 +00:00
Claire
b6abf7a69f
Merge commit 'c4eec632b92c800ae38dba111c4c76e63bb1c0de' into glitch-soc/merge-upstream
2026-04-22 20:24:21 +02:00
David Roetzel
1cae543e8f
Add per-user maximum number of collections ( #38769 )
2026-04-22 12:34:08 +00:00
Claire
e7ee3a997c
Merge commit '28e5c3bb5116d012a1f58b4cbfe1a5fb302ac227' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream added fallback behavior for when the admin-set theme does not exist.
Glitch-soc has a different theming system, but already had similar fallback,
so not changing glitch-soc code.
- `spec/helpers/theme_helper_spec.rb`:
Upstream adapted existing tests for the new fallback behavior, and added some
tests accordingly.
Glitch-soc has a different theming system, adapted the new tests accordingly.
2026-04-20 18:51:00 +02:00
David Roetzel
c0b1fbe0a9
Fix item limit on collections ( #38749 )
2026-04-20 10:17:12 +00:00
Claire
e0a34e6d89
Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream
2026-04-17 18:06:10 +02:00
Matt Jankowski
ea33d7fba6
Add AccountMigration#remaining_cooldown_days method ( #38561 )
2026-04-17 14:01:07 +00:00
David Roetzel
b846f88e16
Improve collection item behavior in REST API ( #38732 )
2026-04-17 13:28:39 +00:00
Shlee
0e4ee62dfc
Fix typo in block_spec.rb ( #38714 )
2026-04-16 15:59:48 +00:00
Claire
6b1e1899fd
Change discoverable accounts to only allow followers to feature them if they are locked ( #38672 )
2026-04-15 15:05:58 +00:00
Claire
ff80786d2e
Merge commit 'd9ea631d5911ebfe090e0d1ea1b11441aa58c918' into glitch-soc/merge-upstream
2026-04-15 13:36:46 +02:00
Matt Jankowski
75bbf73737
Make fields build spec resilient to changed size constant ( #38678 )
2026-04-15 09:29:21 +00:00
Claire
cb62beca08
Merge commit 'dc923c6425559266f0665fe2e294f6e412783810' into glitch-soc/merge-upstream
2026-04-02 18:20:01 +02:00
David Roetzel
814cd61fd8
Remove description presence validation on collections ( #38528 )
2026-04-02 12:56:00 +00:00
Claire
7a4747122e
Merge commit 'ca5c0a144ade4bff7bd10446a39d86116879884e' into glitch-soc/merge-upstream
...
- `CODE_OF_CONDUCT.md`:
Adopt upstream's new Code of Conduct
2026-04-01 19:11:21 +02:00
Claire
b5c1a13341
Merge commit '30275cd80e8552d6cbcdeb11f83a4d5028aa6eae' into glitch-soc/merge-upstream
2026-04-01 18:37:21 +02:00
David Roetzel
62479b7b0a
Remove collections_federation feature flag ( #38508 )
2026-04-01 08:55:41 +00:00
Matt Jankowski
77507d2c7c
Add counting convenience methods on BulkImport ( #38465 )
2026-03-30 08:52:48 +00:00
Claire
30bb39fe54
Merge commit '8e00f7cc8fab9b447f80a27a972eef78186633ad' into glitch-soc/merge-upstream
2026-03-27 18:15:50 +01:00
Matt Jankowski
df9dec741f
Add private method for event export filename ( #38454 )
2026-03-27 15:25:19 +00:00
Claire
2ac493ee8e
Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream
2026-03-26 18:23:45 +01:00
Matt Jankowski
df479d598f
Expand coverage for Tag.search_for method ( #38405 )
2026-03-26 10:03:17 +00:00
Claire
79958d9442
Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/post_status_service.rb`:
Upstream added a line adjacent to one that had been modified due to local-only posting.
Added upstream's change.
- `tsconfig.json`:
Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
glitch-soc had extra paths. Updated as upstream did.
2026-03-25 21:36:32 +01:00
Claire
572f18c322
Merge commit '664efcf4c3f9713894054fb642a252d8752a4123' into glitch-soc/merge-upstream
2026-03-25 21:09:30 +01:00
Eugen Rochko
bcf0718a9a
Add email subscriptions ( #38163 )
2026-03-25 16:25:45 +00:00
Claire
15dbf8040e
Add support for multiple keypairs for remote accounts ( #38279 )
2026-03-25 14:52:12 +00:00
Matt Jankowski
b399dc3191
Add coverage for "fields" feature of Account ( #38369 )
2026-03-25 10:23:45 +00:00
Claire
3d8e40f7c9
Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream
2026-03-24 17:05:53 +01:00
David Roetzel
7788281759
Fix adding items without a position ( #38368 )
2026-03-24 14:43:50 +00:00
Claire
469076c357
Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream
2026-03-20 18:03:14 +01:00
Matt Jankowski
24d3c94f4a
Use delegate in web/push_subscription model for token value ( #38313 )
2026-03-20 15:48:28 +00:00
Claire
8f9eba9629
Add more tests around terminating streaming connections ( #38301 )
2026-03-20 10:00:30 +00:00
Claire
2b0531914f
Merge commit 'd52d0e4dedcc4c8ca12781681debe68f77c007e2' into glitch-soc/merge-upstream
2026-03-18 12:01:23 +01:00
Matt Jankowski
b497bb2908
Normalize current_username on account redirect form ( #38262 )
2026-03-18 09:33:00 +00:00
Claire
3593ddff11
Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream
2026-03-17 18:58:19 +01:00
Claire
04bf07a9cf
Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream
2026-03-17 18:01:07 +01:00
Matt Jankowski
9c4a072adf
Add missing require rails helper to recent moved files ( #38254 )
2026-03-17 15:16:32 +00:00
Matt Jankowski
c37bc5a8a9
Update model-concern-related spec locations for consistency ( #38200 )
2026-03-17 09:50:32 +00:00
