Claire
89c2ac444f
Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream
2026-06-10 18:52:58 +02:00
Claire
22a5e1b0b0
Fix Elasticsearch connection cleanup in Sidekiq middleware ( #39359 )
2026-06-10 15:12:25 +00:00
Matt Jankowski
c51eb56a90
Clarify preview card CLI command handles media only ( #39348 )
2026-06-10 09:27:07 +00:00
Claire
a1ab96baed
Merge commit '52aa8a44bbd0c9a6673cbd9b7c088020be938799' into glitch-soc/merge-upstream
2026-06-03 22:30:16 +02:00
Eugen Rochko
52aa8a44bb
Bump version to v4.6.0-beta.1 ( #39222 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
2026-06-03 15:09:26 +00:00
Claire
003ad015f8
Merge commit '0529a1f7d2197dd535f59163c00634f9c060723d' into glitch-soc/merge-upstream
2026-06-03 14:42:51 +02:00
Claire
0529a1f7d2
Bump version to v4.5.11 ( #39264 )
2026-06-03 12:26:55 +00:00
Claire
659a077616
Merge commit '07236016bcc78a82205093b3e067bf4a1bb07d88' into glitch-soc/merge-upstream
2026-06-03 12:19:05 +02:00
Pia B.
07236016bc
Merge commit from fork
...
* add guard clause to check for node attributes
* check for encoding attribute specifically
* check for encoding attribute specifically
* change spec
2026-06-03 12:12:37 +02:00
Claire
dd12ed2b98
Merge commit 'd1c26c1e27348278fb8081b290e300b327a61ca1' into glitch-soc/merge-upstream
2026-06-02 18:01:45 +02:00
Claire
d1c26c1e27
Fix not importing stylesheet recursively ( #39254 )
2026-06-02 15:23:52 +00:00
Claire
3cf0fb7ba0
Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream
2026-06-01 18:00:03 +02:00
Matt Jankowski
50b6bbe379
Update vite_rails to version 3.11.0 ( #39218 )
2026-06-01 14:51:01 +00:00
Claire
ae2ff31f32
Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream updated the API version, while we also have a custom glitch API version.
Updated as upstream did.
2026-05-30 12:13:35 +02:00
David Roetzel
6d3182a6eb
Move Collections API to v1 namespace ( #39210 )
2026-05-29 08:39:51 +00:00
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
Artemis Tosini
c337487111
Allow HTML lang attribute in remote posts ( #39114 )
2026-05-22 08:43:16 +00:00
Claire
ca427bc176
Merge commit 'f5b57e8ba7a2d3687b1ae496f6213bfe5347c0fa' into glitch-soc/merge-upstream
2026-05-20 15:43:33 +02:00
Claire
f5b57e8ba7
Bump version to v4.5.10 ( #39104 )
2026-05-20 13:20:08 +00:00
Claire
0c80bf0e82
Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream
...
Conflicts:
- `vite.config.mts`:
Upstream changed a line adjacent to one glitch-soc modified due to its theming system.
Adapted upstream's change.
- `yarn.lock`:
Upstream updated a dependency next to one glitch-soc added.
Updated the dependency as upstream did.
2026-05-19 20:40:57 +02:00
Echo
34c91555ae
Refactor emoji search ( #39008 )
2026-05-19 10:47:45 +00:00
Claire
4fcc9b8a40
Merge commit 'd2f640272f3f36c8979cff645416682840528906' into glitch-soc/merge-upstream
2026-05-12 18:37:31 +02:00
Pia B.
a6a8a37ae1
add raketasks to generate collections for testing ( #38986 )
2026-05-11 15:17:00 +00:00
Claire
3072de056a
Merge commit '3a84990780fb1b48999f661f0cea5cb29cca4d33' into glitch-soc/merge-upstream
2026-04-15 16:27:32 +02:00
Claire
3a84990780
Bump version to v4.5.9 ( #38696 )
2026-04-15 14:10:28 +00:00
Claire
ff80786d2e
Merge commit 'd9ea631d5911ebfe090e0d1ea1b11441aa58c918' into glitch-soc/merge-upstream
2026-04-15 13:36:46 +02:00
Claire
f6652caef4
Fix invalid arguments being passed to Redis in custom Chewy strategy ( #38684 )
2026-04-15 09:54:38 +00:00
Claire
1eac058989
Merge commit '73fc8d34d98a80cfb32d3c7c5dc4794fad5470d5' into glitch-soc/merge-upstream
2026-04-11 13:22:19 +02:00
Claire
d6f8ac97e8
Add trademark warning to mastodon:setup task ( #38548 )
2026-04-09 12:30:06 +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
Matt Jankowski
13e21fb1f2
Improve resilience of tootctl maintenance fix-duplicates command ( #38501 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2026-04-01 09:08:15 +00:00
Claire
3d8e40f7c9
Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream
2026-03-24 17:05:53 +01:00
Claire
c72ca33fac
Bump version to v4.5.8 ( #38374 )
2026-03-24 15:51:03 +00:00
Claire
60236bffe6
Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream
2026-03-24 12:13:39 +01:00
Matt Jankowski
bd16e3f63e
Use progress total tracker in accounts CLI ( #38296 )
2026-03-23 08:14:38 +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
90840b3ede
Rename deprecated ffmpeg vsync arg to fps_mode ( #38198 )
2026-03-17 15:44:50 +00:00
Matt Jankowski
b9d25bde3e
Convert mix of JSON.parse and JSON.load_file ( #38242 )
2026-03-17 13:27:57 +00:00
Matt Jankowski
4d33490ec8
Update chewy to version 8.0.1 ( #37983 )
2026-03-17 13:27:37 +00:00
Matt Jankowski
653161fecc
Convert remaining JSON.generate ( #38240 )
2026-03-16 17:18:16 +00:00
Claire
73f77c49d8
Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
Bumped the Mastodon API version as upstream did.
2026-03-16 18:16:56 +01:00
Claire
b7246518bf
Add avatar_description and header_description parameters to PATCH /api/v1/profile ( #38221 )
2026-03-16 14:04:25 +00:00
Matt Jankowski
8124f1581a
Use to_json call in cli/domains ( #38219 )
2026-03-16 14:03:20 +00:00
Claire
4359098740
Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream
2026-03-16 12:17:49 +01:00
Claire
62b90d73d7
Fixes some model definitions in tootctl maintenance fix-duplicates ( #38214 )
2026-03-16 10:00:08 +00:00
Claire
b5222606e3
Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream
2026-03-11 18:50:59 +01:00
Matt Jankowski
53f4d7f029
Update RemoteIp patch with Rails 8.1 changes ( #38139 )
2026-03-11 09:51:49 +00:00
Claire
4bcd0caa79
Merge commit 'e235c446c96280c015fb27f7eefe4e95a5a39892' into glitch-soc/merge-upstream
2026-03-09 12:41:12 +01:00
Claire
e235c446c9
Fix broken option defaults in tootctl email-domain-blocks ( #38107 )
2026-03-09 11:26:16 +00:00
