Claire
99f0a03dec
Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream
2026-05-07 18:26:17 +02:00
Claire
b2aa476abb
Redirect with interstitial when trying to view a remote collection while logged out ( #38941 )
2026-05-07 16:04:26 +00: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
Pia B.
1a2038775c
Add ability to search email blocks by domain ( #38923 )
2026-05-06 15:54:12 +00:00
Matt Jankowski
65b7ddb3e8
Add failing service case to remote account refresh worker spec ( #38922 )
2026-05-06 15:10:12 +00:00
David Roetzel
f6f45c43a9
Add partial accounts to collections endpoint ( #38919 )
2026-05-06 15:08:26 +00:00
David Roetzel
07ce066d68
Move PartialAccountSerializer to the top-level ( #38916 )
2026-05-06 09:35:07 +00:00
Matt Jankowski
d243ba36ce
Add admin area spec for email subscriptions management ( #38912 )
2026-05-06 08:47:12 +00:00
Matt Jankowski
aee0025ca3
Add system spec for managing everyone user role 2FA ( #38911 )
2026-05-06 08:36:42 +00:00
Claire
80a452220c
Merge commit 'cb2e7705848e602b7cdc513560004715134b10d4' into glitch-soc/merge-upstream
2026-05-05 18:01:14 +02:00
Claire
3bc27b9b64
Resolve unknown tagged collections in remote posts ( #38900 )
2026-05-05 14:46:47 +00:00
Claire
6935fce458
Merge commit 'ba83509ff4ed3f7193f3ca5c5deb3038c39620b1' into glitch-soc/merge-upstream
2026-05-04 21:08:25 +02:00
Eugen Rochko
ee88da4511
Add admin UI for managing email subscriptions ( #38741 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2026-05-04 13:56:04 +00:00
Matt Jankowski
696aaa616b
Update rubocop-capybara to version 2.23.0 ( #38868 )
2026-05-04 07:52:29 +00:00
Claire
44394878a4
Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream
2026-04-30 19:00:48 +02:00
Matt Jankowski
59f3d8a993
Handle IPv6 scenario in custom Request::Socket ( #38866 )
2026-04-30 16:03:55 +00:00
Claire
5b395774c0
Add fallback attributes to notifications for new and infrequent notifications ( #38832 )
2026-04-29 15:53:29 +00:00
David Roetzel
6c5bd4f9a8
Handle collections when blocking a user ( #38827 )
2026-04-28 14:49:19 +00:00
David Roetzel
1f1653e039
Remove rejected and revoked collection items ( #38792 )
2026-04-28 11:10:25 +00:00
David Roetzel
d5f8b08d69
Add collections to Flag activities ( #38817 )
2026-04-28 11:09:43 +00:00
Claire
57017329a4
Merge commit '2dd630bc581dfd73950b45f6c3b1f47619b7ea6c' into glitch-soc/merge-upstream
2026-04-27 20:18:51 +02:00
David Roetzel
2dd630bc58
Only update FASP availability if it actually changed ( #38818 )
2026-04-27 13:15:53 +00:00
Claire
b3bae7e78f
Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
Added upstream's new setting.
2026-04-25 09:20:39 +02:00
David Roetzel
fdb2563abf
Use /collections/:id as canonical URL for a collection ( #38783 )
2026-04-23 07:36:35 +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
Matt Jankowski
28e5c3bb51
Add coverage for "no change" scenario in admin change emails ( #38754 )
2026-04-20 16:05:46 +00:00
Claire
ccf5c09ad3
Fix incorrect value for feature_approval.current_user for local users ( #38751 )
2026-04-20 16:00:15 +00:00
David Roetzel
c0b1fbe0a9
Fix item limit on collections ( #38749 )
2026-04-20 10:17:12 +00:00
Shlee
bdad4f78f3
Fallback to default theme when admin-selected theme does not exist ( #38703 )
2026-04-17 16:57:38 +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
Matt Jankowski
3411d06f9e
Pull user settings defaults from configuration ( #38592 )
2026-04-17 08:31:37 +00:00
Matt Jankowski
d5f0e37260
Include hosts resolver in request socket DNS lookup ( #38699 )
2026-04-17 08:09:37 +00:00
Claire
fc1ba93cdc
Refactor featured collections URL code ( #38709 )
2026-04-16 16:00:13 +00:00
Shlee
0e4ee62dfc
Fix typo in block_spec.rb ( #38714 )
2026-04-16 15:59:48 +00:00
David Roetzel
e711f9d492
Federate featured item creation date ( #38713 )
2026-04-16 15:44:50 +00:00
David Roetzel
961acaf202
Include collection url in API responses ( #38708 )
2026-04-16 10:09:39 +00:00
David Roetzel
fee38e57f0
Federate and store a collection url ( #38697 )
2026-04-16 07:26:34 +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
817291c692
Merge commit '2b93d19d2ca18366b015e3dcde412e67625fe8f5' into glitch-soc/merge-upstream
2026-04-14 18:19:27 +02:00
Claire
63a244fe1a
Add /api/v1_alpha/accounts/:id/in_collections to list collections you are in ( #38657 )
2026-04-13 17:28:28 +00:00
Claire
1eac058989
Merge commit '73fc8d34d98a80cfb32d3c7c5dc4794fad5470d5' into glitch-soc/merge-upstream
2026-04-11 13:22:19 +02:00
Claire
8124d44ee1
Fix local collection uri not being serialized in REST API responses ( #38645 )
2026-04-10 15:01:28 +00:00
Shlee
8bc0eaa1bb
Fix typo in create_collection_service.rb ( #38629 )
2026-04-10 08:55:23 +00:00
