Claire
3b4c4c5b09
Merge commit '65b216353e9bc9ae8517d967f8c2cd8122551fdc' into glitch-soc/merge-upstream
...
- `app/helpers/application_helper.rb`:
Upstream updated the classes used for theming purposes,
but glitch-soc has its own theming system.
Adapted upstream's changes.
- `spec/helpers/application_helper_spec.rb`:
Upstream updated the classes used for theming purposes,
but glitch-soc has its own theming system.
Adapted upstream's changes.
2025-12-05 19:25:40 +01:00
Claire
c8f365fd1d
Merge commit '0dac31dfd588e4cd866f382ed001a9535f06234a' into glitch-soc/merge-upstream
2025-12-04 20:59:54 +01:00
Claire
34aa825e96
Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream
2025-12-04 20:16:21 +01:00
diondiondion
65b216353e
Handle dark/light/contrast theme modes in common CSS ( #37095 )
2025-12-04 15:56:35 +00:00
David Roetzel
75b9e9a8b0
Enable missing before actions in Collection API ( #37122 )
2025-12-04 15:35:47 +00:00
Claire
88aed3c11a
Fix streamed quoted polls not being hydrated correctly ( #37118 )
2025-12-04 14:10:48 +00:00
David Roetzel
9921fa1af7
First draft API to delete collections ( #37117 )
2025-12-04 13:47:23 +00:00
David Roetzel
5a7a4fff11
First draft of Collection update API ( #37110 )
2025-12-04 10:00:21 +00:00
Matt Jankowski
832d8c7397
Use thread support helper in concurrent insert tag spec ( #37112 )
2025-12-04 09:11:53 +00:00
Matt Jankowski
d063af2594
Add coverage for array vs string in Tag.find_or_create_by ( #37113 )
2025-12-04 08:46:24 +00:00
Matt Jankowski
7c730e9041
Use normalizes API for Tag display_name value ( #35797 )
2025-12-03 15:39:01 +00:00
Matt Jankowski
b3b5bf26d1
Remove duplicate set_locale around action in auth/registrations ( #36455 )
2025-12-03 15:34:10 +00:00
David Roetzel
4e6d1892b9
Fix creation of duplicate conversations ( #37108 )
2025-12-03 14:33:27 +00:00
Claire
f8422e1fa4
Add API for on-demand generation of annual reports ( #37055 )
2025-12-02 13:37:05 +00:00
David Roetzel
2d203ca72a
First draft of API to get a single collection ( #37053 )
2025-12-01 15:04:52 +00:00
Christian Oelschlegel
1f9ddb7cf6
fix(tag): prevent dupl. tags on concurrent inserts ( #35792 )
...
Co-authored-by: Christian Oelschlegel <oelschle@sciphy.de>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-12-01 14:56:52 +00:00
Claire
99ff59b7b2
Merge commit '37ccffa95a30772b55e3f18d486d699ee6c5f9e8' into glitch-soc/merge-upstream
2025-11-30 17:47:27 +01:00
Claire
44e6abe48b
Merge commit '0004ed4c8021ebd400d32eb32a5e479ebd7bcf91' into glitch-soc/merge-upstream
2025-11-30 16:40:18 +01:00
David Roetzel
f896bbac3b
Draft API to create Collections ( #37049 )
2025-11-28 13:30:43 +00:00
Claire
945ef5a8e1
Remove unused data from 2025 annual reports ( #37033 )
2025-11-28 08:58:34 +00:00
Eashwar Ranganathan
826e9d7047
Make tootctl aware of 'require approval' for email domains ( #34579 )
2025-11-27 15:52:59 +00:00
David Roetzel
322a4fee53
First steps towards a collection creation service ( #37020 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-11-27 09:36:44 +00:00
Matt Jankowski
cb4f1cc89c
Improve SessionActivation.activate spec ( #36983 )
2025-11-26 10:26:39 +00:00
David Roetzel
0725afe1a9
Collections: Add missing validations for boolean columns ( #37005 )
2025-11-25 14:46:50 +00:00
Claire
b76530a7f1
Merge commit '76d8ac3fe680e92d20059c590ccb1cd8f74078c2' into glitch-soc/merge-upstream
2025-11-24 19:08:03 +01:00
David Roetzel
b16452dd99
Add shared context for API authentication ( #36981 )
2025-11-24 08:48:49 +00:00
Claire
652ed7ab50
Merge commit '585545d0d5678a6ea4b958af4a3bc6593134d0f6' into glitch-soc/merge-upstream
2025-11-21 19:33:14 +01:00
Matt Jankowski
585545d0d5
Add coverage for media#player scenarios ( #35947 )
2025-11-21 14:46:29 +00:00
David Roetzel
7ffa5fa0c4
Add models to represent "Collections" ( #36977 )
2025-11-21 10:28:23 +00:00
Claire
7a56972381
Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream
2025-11-19 21:49:09 +01:00
Matt Jankowski
4f6a7e44d1
Update rubocop-rspec to version 3.8.0 ( #36853 )
2025-11-19 10:14:51 +00:00
Matt Jankowski
53703202fb
Add IpBlock#to_cidr method to build string ( #35773 )
2025-11-17 14:51:05 +00:00
Matt Jankowski
59fdff5dc5
Add spec for translation attempt with ineligible target language ( #36813 )
2025-11-17 14:13:52 +00:00
Claire
9525134c28
Merge commit '7e7f63a2efc83edd7c59a12e55eaab9509a4c15b' into glitch-soc/merge-upstream
2025-11-12 18:11:41 +01:00
Claire
ed3710e58f
Fix Update importing old previously-unknown activities and treating them as recent ones ( #36848 )
2025-11-12 16:09:00 +00:00
Claire
d31aaf9ed8
Merge commit '1c3e7545cb6137025a6efd208d195352c54ffda8' into glitch-soc/merge-upstream
2025-11-10 22:18:01 +01:00
Matt Jankowski
1c3e7545cb
Add spec for translation attempt on private status ( #36810 )
2025-11-10 16:05:20 +00:00
Matt Jankowski
63e2ca5d27
Add spec for hitting max status pins limit in pin api ( #36789 )
2025-11-10 10:06:47 +00:00
Claire
c1ef6e31cb
Merge commit '441eb895371cf8ed6a5b8e294367bbbfd0f4c037' into glitch-soc/merge-upstream
2025-11-08 10:44:43 +01:00
Claire
70d71c10c8
Fix /api/v1/statuses/:id/context sometimes returing Mastodon-Async-Refresh without result_count ( #36779 )
2025-11-07 10:02:25 +00:00
Claire
8d1208224f
Merge commit 'd1f57822af0da2b2836e33baab5f89469ac6fa25' into glitch-soc/merge-upstream
2025-11-03 21:04:45 +01:00
Claire
9b3e92bf17
Prevent creation of Private Mentions quoting someone who is not mentioned ( #36689 )
2025-11-03 14:16:25 +00:00
Claire
6ff4dad89d
Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream
2025-10-31 18:03:21 +01:00
Matt Jankowski
aefd728309
Use before_action to protect hidden collections in following/followers lists ( #35783 )
2025-10-30 16:34:19 +00:00
Claire
762e87b121
Fix SMTP configuration with mail 2.9.0 ( #36646 )
2025-10-30 11:21:32 +00:00
Claire
48ec31bec8
Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed stuff too close to glitch-soc's theming system changes.
Applied upstream's changes.
- `streaming/index.js`:
Upstream refactored a bunch of stuff where our code was different due to
local-only posts.
Applied upstream's changes while taking care of local-only posts.
2025-10-28 22:10:12 +01:00
Claire
79169408b0
Fix tests on glitch-soc
2025-10-28 20:39:10 +01:00
Claire
5f3f75559f
Merge commit '1dead10312caa0cc7719cb80052af549ddf3e6a1' into glitch-soc/merge-upstream
2025-10-28 20:25:09 +01:00
Claire
8fb524e07f
Add support for Update of converted object types ( #36322 )
2025-10-28 14:05:14 +00:00
Claire
4b42fe6aba
Change API behavior of reblogs wrt. quotes for consistency ( #36559 )
2025-10-28 08:05:23 +00:00
