Claire
fe6d3690fd
Merge commit '5fe316b2e94bccb91732a1d6675854abb60e9a4b' into glitch-soc/merge-4.5
2025-11-19 22:15:12 +01:00
Shugo Maeda
44d45e5705
Fix ArgumentError of tootctl upgrade storage-schema ( #36914 )
2025-11-19 15:20:01 +01:00
Claire
27c67f1750
Fix cross-origin handling of CSS modules ( #36890 )
2025-11-19 15:20:01 +01:00
Claire
585827c14f
Merge commit 'bb6093c3153f092736e2f25959e3dcdceeb7bce1' into glitch-soc/merge-4.5
2025-11-13 17:22:33 +01:00
Claire
bb6093c315
Bump version to v4.5.1
2025-11-13 17:12:07 +01:00
Claire
3ca92c4ae2
Merge commit '26c78392f88afccebb8a88b68bc9994a9ce12648' into glitch-soc/merge-4.5
2025-11-06 12:49:01 +01:00
Claire
26c78392f8
Bump version to v4.5.0 ( #36732 )
2025-11-06 12:39:07 +01:00
Claire
7ea3c6a039
Merge commit 'e91c7645905972d9663a0d944b133ff24670bce2' into glitch-soc/merge-4.5
2025-11-05 10:02:33 +01:00
Claire
e91c764590
Bump version to v4.5.0-rc.3
2025-11-05 09:59:00 +01:00
Claire
5f5e6ca031
Merge commit 'af4c372ab22b636742833592235d18418604fcc1' into glitch-soc/merge-4.5
2025-10-31 16:04:05 +01:00
Claire
af4c372ab2
Bump version to v4.5.0-rc.2
2025-10-31 16:01:06 +01:00
Claire
e4291e9b05
Fix SMTP configuration with mail 2.9.0 ( #36646 )
2025-10-31 14:09:36 +01: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
Claire
515ce38a52
Merge commit '51d0bfcb385b49bfdd30b742d05e8e37257168d6' into glitch-soc/merge-upstream
2025-10-17 18:11:59 +02:00
Echo
51d0bfcb38
Emoji: Update Twemoji to v16 ( #36501 )
2025-10-16 13:15:16 +00:00
Claire
ef413ef713
Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream
2025-10-15 16:35:37 +02:00
Claire
c5fb080ab8
Bump version to v4.5.0-beta.1 ( #36479 )
2025-10-15 13:09:25 +00:00
Claire
be762da45f
Merge commit '254fff93ca3604438a94a453bedfe6f499e2cd66' into glitch-soc/merge-upstream
2025-10-13 16:51:40 +02:00
Claire
254fff93ca
Bump version to v4.4.6 ( #36447 )
2025-10-13 14:31:12 +00:00
Claire
8921494571
Merge commit '7e98fa9b476fdaed235519f1d527eb956004ba0c' into glitch-soc/merge-upstream
2025-10-13 14:26:11 +02:00
Emelia Smith
24dcb18013
Merge commit from fork
...
* Ensure tootctl revokes sessions, access tokens and web push subscriptions
* Fix test coverage
2025-10-13 14:20:23 +02:00
Claire
b15b07606c
Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream
2025-09-24 18:26:13 +02:00
Claire
e1f7847b64
Remove the outgoing_quotes feature flag, making the feature unconditional ( #36130 )
2025-09-24 08:58:08 +00:00
Claire
cc52833296
Merge commit '38fa0102c111f1c0cff5a42eba6882ffae4ca109' into glitch-soc/merge-upstream
2025-09-15 18:39:09 +02:00
Claire
943cdc5b21
Add example post with manual quote approval policy to dev:populate_sample_data ( #36099 )
2025-09-15 15:35:33 +00:00
Claire
6fc9febb47
Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream
2025-09-05 20:03:42 +02:00
Matt Jankowski
27969c3077
Update rubocop to version 1.80.2 ( #36007 )
2025-09-04 08:14:01 +00:00
Claire
d5b959a2ca
Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some preferences to a new category, while glitch-soc had an
extra preference there.
Moved the extra preference like upstream did to the new category.
2025-09-02 19:07:51 +02:00
Matt Jankowski
70da14871f
Remove unused require of rubygems/package from ip blocks CLI class ( #35957 )
2025-09-01 06:23:39 +00:00
Claire
6abe6cdef5
Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream
2025-08-29 18:21:28 +02:00
Claire
4ecbaea8bb
Conditionally bump API version depending on quote post feature flag ( #35939 )
2025-08-29 10:33:35 +00:00
Claire
e8fe33f273
Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's theming system.
Updated the line as upstream did.
2025-08-25 22:15:28 +02:00
Claire
2560242972
Add quotes_count to statuses stats ( #35832 )
2025-08-25 12:21:28 +00:00
Claire
4d9150735a
Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
Updated the dependency as upstream did.
2025-08-17 20:52:34 +02:00
Matt Jankowski
5ee83a680b
Update stoplight to version 5.3.1 ( #35129 )
2025-08-12 08:15:22 +00:00
Claire
3f166bb068
Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream
2025-08-05 15:46:33 +02:00
Claire
ffeb5da991
Bump version to v4.4.3 ( #35687 )
2025-08-05 13:32:20 +00:00
Claire
dbab707d64
Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream
2025-08-01 22:11:59 +02:00
Claire
19db4cb7c1
Add example of quote post with a preview card to development sample data ( #35616 )
2025-07-31 13:39:26 +00:00
Claire
f7388af721
Fix Chewy::UndefinedUpdateStrategy in dev:populate_sample_data task when Elasticsearch is enabled ( #35615 )
2025-07-31 12:34:21 +00:00
Claire
e53421b548
Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Not a real conflict, upstream removed settings that are identical in glitch-soc
but textually adjacent to glitch-soc-only settings.
Removed what upstream removed.
2025-07-30 20:05:45 +02:00
Claire
efc0d237af
Fix synchronous recursive fetching of deeply-nested quoted posts ( #35600 )
2025-07-30 14:39:30 +00:00
Matt Jankowski
3146109b08
Add MediaAttachment.combined_media_file_size method ( #35570 )
2025-07-30 12:57:51 +00:00
