Claire
4359098740
Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream
2026-03-16 12:17:49 +01:00
David Roetzel
12c63a382c
Handle adding already approved collection items ( #38213 )
2026-03-16 10:35:07 +00:00
Claire
5521aac4ab
Fix hashtags preceded by non-break spaces not being processed as such ( #38212 )
2026-03-16 09:39:18 +00:00
David Roetzel
c993daa347
Start of handling FeatureRequest activities ( #38193 )
2026-03-16 09:04:28 +00:00
David Roetzel
2f989c780a
Reinstate action logging ( #38211 )
2026-03-16 08:42:06 +00:00
Matt Jankowski
f561014aa8
Make use of email_domain in sign up approval check ( #38199 )
2026-03-16 08:34:18 +00:00
Matt Jankowski
a9c248f14f
Limit email domain block variant query to unique values ( #38196 )
2026-03-16 08:11:32 +00:00
Claire
3afb58ad18
Merge commit '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream
2026-03-14 11:41:24 +01:00
Matt Jankowski
6416724f75
Normalize current_username on account migration ( #38183 )
2026-03-13 09:33:02 +00:00
Claire
d099de23c5
Merge commit 'bf32befcc21831b31f684795bb211b2f1f4cfb6d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream reordered model annotations, while glitch-soc has extra columns.
Reordered as upstream did.
- `app/models/status_edit.rb`:
Upstream reordered model annotations, while glitch-soc has extra columns.
Reordered as upstream did.
2026-03-12 19:01:28 +01:00
Claire
3833eadfbf
Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream
2026-03-12 18:48:32 +01:00
Matt Jankowski
bf32befcc2
Run annotaterb models after bug fix to re-order model comments ( #38172 )
2026-03-12 14:00:41 +00:00
David Roetzel
84d8020165
Store a remote actor's featuredCollections URI ( #38166 )
2026-03-12 09:11:32 +00:00
Claire
b5222606e3
Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream
2026-03-11 18:50:59 +01:00
David Roetzel
3091e2e525
Ingestion of remote collections ( #38144 )
2026-03-11 14:29:00 +00:00
Matt Jankowski
dc004caf71
Convert attempt IP from EmailDomainBlock history tracking to string before recording ( #38137 )
2026-03-11 10:49:07 +00:00
Claire
5fdcac60b9
Merge commit '64629eadb71afab79a741b016dc56a8bdf1d46f2' into glitch-soc/merge-upstream
2026-03-10 18:04:32 +01:00
Matt Jankowski
64629eadb7
Do not prepare returning user for unpersisted records ( #38136 )
2026-03-10 16:37:59 +00:00
David Roetzel
3b6d94ce62
Add column for html descriptions of collections ( #38124 )
2026-03-10 14:54:38 +00:00
Claire
8d717ab161
Merge commit '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/application_controller_spec.rb`:
Upstream moved specs that were textually-adjacent to glitch-soc ones.
Kept the glitch-soc ones.
2026-03-09 18:14:15 +01:00
David Roetzel
1d46558e8d
Ingestion of remote collection items ( #38106 )
2026-03-09 14:59:57 +00:00
Claire
4bcd0caa79
Merge commit 'e235c446c96280c015fb27f7eefe4e95a5a39892' into glitch-soc/merge-upstream
2026-03-09 12:41:12 +01:00
Matt Jankowski
fcc3fac8a8
Fix Style/ReduceToHash cop ( #38088 )
2026-03-09 10:01:12 +00:00
Matt Jankowski
3b1705a406
Add TermsOfService#usable_effective_date to DRY up view logic ( #38095 )
2026-03-09 09:38:00 +00:00
Claire
c96db36396
Merge commit '8a0261c51caf76b6d12e3801da471759c31c9608' into glitch-soc/merge-upstream
2026-03-04 12:40:16 +01:00
Claire
8a0261c51c
Add missing_attribution boolean to preview cards ( #38043 )
2026-03-04 11:18:37 +00:00
Claire
799bd69189
Merge commit '2f657019201d73c9d86d1ece339e66e72954f0eb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Upstream refactored a line adjacent to a glitch-soc modified line.
Ported upstream changes.
2026-03-02 12:19:02 +01:00
David Roetzel
2f65701920
Add service to revoke inclusion in a Collection ( #38026 )
2026-03-02 10:16:41 +00:00
Matt Jankowski
c86a8f8798
Use file_field support for array to accept attribute ( #37844 )
2026-03-02 09:27:04 +00:00
Claire
0e1ea3110e
Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
line adding a glitch API version.
2026-02-27 21:25:37 +01:00
Matt Jankowski
7e5e96739f
Use consistent calling style for TagManager#normalize_domain ( #35764 )
2026-02-27 16:38:34 +00:00
Matt Jankowski
9762b4a75c
Use normalizes for tag name attribute ( #37119 )
2026-02-27 15:56:08 +00:00
David Roetzel
6b88dd4923
Issue FeatureAuthorizations ( #38004 )
2026-02-27 11:00:21 +00:00
Claire
dc27eccc8e
Merge commit 'bca57020a04c552a3c91912a0e0b69ddafaad06a' into glitch-soc/merge-upstream
2026-02-26 18:27:02 +01:00
David Roetzel
b09e63da87
Federate activity when remote account is added to a Collection ( #37992 )
2026-02-26 15:11:02 +00:00
David Roetzel
51b81b3ce9
Allow remote accounts in Collections ( #37989 )
2026-02-26 13:31:23 +00:00
Claire
e3cb4dea42
Merge commit '4d2a148ccbedc818c98fd712a0b44869c1019321' into glitch-soc/merge-upstream
2026-02-25 19:11:22 +01:00
David Roetzel
f9326efef6
Add moderation consequences for collections ( #37974 )
2026-02-25 14:32:07 +00:00
David Roetzel
e2c9426c77
Split status batch and moderation actions ( #37970 )
2026-02-25 10:07:46 +00:00
David Roetzel
72406a1cd1
Refactor: Introduce admin base action class ( #37960 )
2026-02-24 14:22:44 +00:00
Claire
c15c49b5b6
Merge commit '1e87bd178d96ab7d760f019fcf651ecc1585e701' into glitch-soc/merge-upstream
2026-02-24 15:14:25 +01:00
Claire
43ef9f66b6
Add PATCH /api/v1/profile ( #37934 )
2026-02-24 10:48:56 +00:00
Claire
85f72a3940
Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream
2026-02-20 21:08:06 +01:00
David Roetzel
6ba6285a73
Reject unconfirmed FASPs ( #37926 )
2026-02-20 14:40:31 +00:00
Claire
eebed16f59
Merge commit '8e7c3973dc67835e0ce9c7073b9344ec19d3910a' into glitch-soc/merge-upstream
2026-02-19 21:52:23 +01:00
David Roetzel
e288bf6516
Show reported collections in moderation interface ( #37898 )
2026-02-19 12:46:38 +00:00
Claire
925d1ffde5
Fix Ruby linting for glitch-soc code
2026-02-18 18:47:21 +01:00
Claire
b041869887
Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream
2026-02-18 18:40:03 +01:00
Claire
bd64ca2583
Add new profile settings ( #37890 )
2026-02-18 13:18:44 +00:00
Nicholas La Roux
438602c488
Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences ( #37795 )
2026-02-17 14:56:46 +00:00
