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
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
Claire
3b7c33e763
Add exclude_direct flag to /api/v1/accounts/:id/statuses to exclude direct messages ( #37763 )
2026-02-27 09:34:12 +00:00
Claire
c15c49b5b6
Merge commit '1e87bd178d96ab7d760f019fcf651ecc1585e701' into glitch-soc/merge-upstream
2026-02-24 15:14:25 +01:00
Claire
1e87bd178d
Bump version to v4.5.7 ( #37965 )
2026-02-24 13:54:33 +00:00
Claire
b041869887
Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream
2026-02-18 18:40:03 +01: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
Claire
e451416d90
Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream
2026-02-12 18:00:45 +01:00
Claire
37e82ee66f
Add --suspended-only option to tootctl emoji purge ( #37828 )
2026-02-12 10:25:29 +00:00
Claire
2f8ecb894e
Fix generation of static error pages in glitch-soc
2026-02-11 14:12:46 +01:00
Claire
01b576efed
Add skin migrations for glitch-soc
2026-02-11 13:49:27 +01:00
Claire
4fbd1ad7ae
Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream
...
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.
They were all manually resolved by adapting the relevant code.
2026-02-11 13:32:18 +01:00
Claire
d13d7b4566
Fix server theme migration ( #37810 )
2026-02-10 20:53:43 +00:00
Claire
13499168f8
Merge commit 'c48634cf5f3c5b50fcf6ea075121fa2d88e07c0e' into glitch-soc/merge-upstream
2026-02-03 15:44:04 +01:00
Claire
c48634cf5f
Bump version to v4.5.6 ( #37722 )
2026-02-03 14:28:23 +00:00
Claire
d62a7775b5
Merge commit 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream
2026-01-29 21:08:46 +01:00
Daniel King
d5d57ac25a
Add flag to preserve cached media on cleanup ( #36200 )
...
Co-authored-by: Daniel King <git@kin.gy >
2026-01-29 15:53:51 +00:00
Matt Jankowski
23148dc536
Update rubocop to version 1.8.40 ( #37628 )
2026-01-29 10:14:14 +00:00
Claire
b14cbb3ee9
Merge pull request #3364 from ClearlyClaire/glitch-soc/features/local-only-drop-emoji
...
Deprecate eye emoji in favor of a bespoke API parameter
2026-01-27 22:30:17 +01:00
Claire
8b95254883
Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream
2026-01-23 17:57:20 +01:00
Matt Jankowski
157d8c0d99
Remove deprecated usage of imagemagick ( #37488 )
2026-01-22 14:57:19 +00:00
Claire
5d04c56c48
Merge commit '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream
2026-01-20 16:14:14 +01:00
Claire
400c1f3e8e
Bump version to v4.5.5 ( #37551 )
2026-01-20 15:00:10 +00:00
Claire
b4ed1e6c99
Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream added a helper to insert javascript tags, close to where we had
modified code.
Ported upstream's change.
2026-01-13 18:30:48 +01:00
Matt Jankowski
92ad380e11
Update rubocop to version 1.82.1 ( #37475 )
2026-01-13 16:21:25 +00:00
Claire
aa6ec435d2
Merge commit '9fe14a30724e18425aedaba59ca63c63d8b14083' into glitch-soc/merge-upstream
2026-01-07 14:53:51 +01:00
Claire
9fe14a3072
Bump version to v4.5.4 ( #37413 )
2026-01-07 13:40:06 +00:00
Claire
97ff0f94bf
Merge commit 'a8109e50fc313b8124a3e471d41b490df59a68b8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed a field that was moved to another page due to glitch-soc's theming system.
Ignored this one change.
2025-12-18 18:10:30 +01:00
Joshua Rogers
38bc7d2864
Use HTTPS when downloading unicode.org's emoji-test.txt ( #37290 )
2025-12-18 10:11:54 +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
Eashwar Ranganathan
826e9d7047
Make tootctl aware of 'require approval' for email domains ( #34579 )
2025-11-27 15:52:59 +00:00
Claire
00163e89bf
Fix tootctl status remove removing quoted posts and remote quotes of local posts ( #37009 )
2025-11-26 10:26:26 +00:00
Claire
7a56972381
Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream
2025-11-19 21:49:09 +01:00
Matt Jankowski
53703202fb
Add IpBlock#to_cidr method to build string ( #35773 )
2025-11-17 14:51:05 +00:00
Shugo Maeda
04c566e2e9
Fix ArgumentError of tootctl upgrade storage-schema ( #36914 )
2025-11-17 13:34:20 +00:00
Claire
e0d7230f97
Merge commit 'c87b05282909383353a9561e97b9f18a2db0766d' into glitch-soc/merge-upstream
2025-11-14 18:19:00 +01:00
Claire
6db4297193
Fix cross-origin handling of CSS modules ( #36890 )
2025-11-14 15:42:26 +00:00
Claire
6ff4dad89d
Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream
2025-10-31 18:03:21 +01:00
Claire
8a2826604c
Bump version to v4.6.0-alpha.1 ( #36667 )
2025-10-31 13:24:26 +00:00
Claire
762e87b121
Fix SMTP configuration with mail 2.9.0 ( #36646 )
2025-10-30 11:21:32 +00:00
Claire
002e592667
Merge commit '51877081b435b38e1c5bd449087279469fa7c667' into glitch-soc/merge-upstream
2025-10-29 12:24:49 +01:00
Claire
51877081b4
Bump version to v4.5.0-rc.1 ( #36635 )
2025-10-29 11:11:33 +00:00
Claire
5f3f75559f
Merge commit '1dead10312caa0cc7719cb80052af549ddf3e6a1' into glitch-soc/merge-upstream
2025-10-28 20:25:09 +01:00
Claire
38f15a89fe
Fix recent settings migrations ( #36602 )
2025-10-27 12:24:24 +00:00
Claire
209434cb1d
Merge commit '17eb1a7e668dbba6e79612395b99407e8e8de6b9' into glitch-soc/merge-upstream
2025-10-21 18:15:56 +02:00
Renaud Chaput
b80ec3721d
Drop support for PostgreSQL 13 ( #36540 )
2025-10-21 14:26:00 +00:00
Claire
5674100f0b
Merge commit '118ff13bd028cfb19370a12edb9307ea96007ad7' into glitch-soc/merge-upstream
2025-10-21 15:57:43 +02:00
Claire
118ff13bd0
Bump version to v4.5.0-beta.2 ( #36543 )
2025-10-21 13:43:38 +00:00
