Claire
1ed3e4cc77
Merge commit '5478ef9b32be0c7ac8f86330760485a7531d218a' into glitch-soc/backports-4.4
2025-08-05 15:24:44 +02:00
Claire
5478ef9b32
Bump version to v4.4.3 ( #35686 )
2025-08-05 15:20:40 +02:00
Claire
fcb7917344
Merge commit '208cb8276ae618aa36aec5fad0dc31341402c133' into glitch-soc/merge-4.4
...
Conflicts:
- `app/models/trends/statuses.rb`:
Conflict because of glitch-soc's setting to allow CWs in trends.
Kept glitch-soc's setting but followed upstream's refactor.
2025-08-04 21:48:37 +02:00
Claire
08b2f255fc
Fix synchronous recursive fetching of deeply-nested quoted posts ( #35600 )
2025-08-01 11:34:27 +02:00
Claire
e69c1479a8
Merge commit '77d2cdb30230ae6292bd247f6c6f97d00bd38084' into glitch-soc/backports-4.4
2025-07-23 18:10:05 +02:00
David Roetzel
aec6d0f807
Bump version to v4.4.2
2025-07-23 16:08:43 +02:00
Claire
ec6f93ae45
Merge commit '609a40181e0f3f505707d196985dfb78ab3b3f88' into glitch-soc/merge-4.4
2025-07-09 17:31:28 +02:00
Claire
609a40181e
Bump version to v4.4.1
2025-07-09 17:16:57 +02:00
Claire
18e08bf493
Merge commit 'c1794fb948dfb13865214bce8a90e88da44d4ff6' into glitch-soc/merge-4.4
2025-07-08 15:51:09 +02:00
Claire
c1794fb948
Bump version to v4.4.0 ( #35268 )
2025-07-08 15:25:26 +02:00
Claire
bd442485d0
Merge commit '333a17a478f0ddcee4115a50f01077cb1dc5c22e' into glitch-soc/merge-4.4
2025-07-08 13:13:07 +02:00
David Roetzel
333a17a478
Better error response to malformed headers ( #35278 )
2025-07-08 11:45:24 +02:00
Claire
98e90b7c1f
Merge commit 'a203a05eb10db82e1db2d75398e0261cfe4d33e4' into glitch-soc/merge-upstream
2025-07-01 18:47:15 +02:00
Claire
68090cd8be
Bump version to v4.4.0-rc.1 ( #35196 )
2025-07-01 09:21:32 +00:00
Claire
2eec4da8fc
Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream
2025-06-30 17:52:22 +02:00
David Roetzel
c357a7f8d6
Add optional bulk mailer settings ( #35203 )
2025-06-30 14:49:14 +00:00
Claire
153af19f55
Add specs for PublicFileServer middleware ( #35219 )
2025-06-30 11:23:11 +00:00
Jeong Arm
87db28cebc
Fix unexpected "cache-control: no-cache" header in public file server ( #35209 )
2025-06-30 09:06:18 +00:00
Claire
f7b4580b49
Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a file, glitch-soc had extra files.
Took upstream's changes and moved glitch-soc's additions at the end.
2025-06-26 18:04:37 +02:00
David Roetzel
48451b782d
Move email env var reading to yml files ( #35191 )
2025-06-26 12:18:30 +00:00
Claire
c9a1e27a49
Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
glitch-soc had extra paths under `app/javascript/flavours`, but upstream
added `app/javascript` as a whole, so updated to upstream's.
2025-06-25 19:29:09 +02:00
Claire
dbb20f76a7
Fix crash in development environment with no prebuilt assets and no vite dev server running ( #35177 )
2025-06-25 14:20:07 +00:00
Matt Jankowski
9f16f41678
Remove patch for unsupported redis version ( #35155 )
2025-06-25 07:53:38 +00:00
Claire
9fccf0a8c6
Merge commit '6166e616389b051039dc76635048e2519271832a' into glitch-soc/merge-upstream
2025-06-24 20:45:46 +02:00
Matt Jankowski
8837fd8c54
Update rubocop to version 1.77.0 ( #35128 )
2025-06-23 07:40:11 +00:00
Claire
fc87ce7ca1
Merge commit '98f98249ffc3de0d020fa2ed9068b1cb82168984' into glitch-soc/merge-upstream
2025-06-17 18:56:38 +02:00
Claire
98f98249ff
Bump version to v4.4.0-beta.2 ( #35076 )
2025-06-17 16:43:17 +00:00
Claire
0bb83dfe7d
Merge commit '69f298731e523f7f2e97ddd6a559dfb485d4495c' into glitch-soc/merge-upstream
2025-06-16 21:07:55 +02:00
Claire
013c527406
Fix vite helpers crash in development mode ( #35035 )
...
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com >
2025-06-16 14:25:12 +00:00
Claire
80af1ea434
Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict because of different theming system.
Adapted upstream's changes.
- `vite.config.mts`:
Conflict because of different theming system.
Adapted upstream's changes.
2025-06-12 20:32:25 +02:00
Echo
825312d4b0
Fix theme name requirement regression with efficient lookup by name ( #35007 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-06-12 14:09:45 +00:00
Claire
86a7a1ef3b
Merge commit '3aed93711c0118ab68fa09f4d3ac2635cb3344b8' into glitch-soc/merge-upstream
2025-06-11 22:52:21 +02:00
David Roetzel
1623d54ec0
Start local prometheus_exporter server only in puma/sidekiq startup ( #35005 )
2025-06-11 13:37:59 +00:00
Claire
2085b0b53a
Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
Not a real conflict, just glitch-soc code textually adjacent to code added
upstream.
2025-06-05 18:02:40 +02:00
Matt Jankowski
e2c5a2abaa
Fix Style/FetchEnvVar cop in repo.rake ( #34903 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-06-05 13:37:33 +00:00
Matt Jankowski
1297ad759e
Update rubocop to version 1.76.0 ( #34926 )
2025-06-05 12:09:05 +00:00
Claire
5d9e5967aa
Merge commit 'f7c19226cff625895478b80302201c98f36163c8' into glitch-soc/merge-upstream
2025-06-04 11:01:40 +02:00
Claire
f7c19226cf
Bump version to v4.4.0-beta.1 ( #34912 )
2025-06-04 08:47:18 +00:00
Claire
088af860b3
Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream
2025-06-02 12:16:06 +02:00
Matt Jankowski
0d5123199f
Fix Style/FormatStringToken cop ( #34861 )
2025-06-02 07:37:33 +00:00
Claire
086a7016c4
Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream
...
Conflicts:
- `vite.config.mts`:
Upstream moved its theming system to a plug-in, where we had our own.
Adapted the file as well as our own plugin to adopt the same mechanisms.
2025-05-27 20:49:19 +02:00
Claire
e8f713ba57
Merge commit '47512fe51867fd30f13e02731a9733fa971e8837' into glitch-soc/merge-upstream
2025-05-26 18:46:50 +02:00
Matt Jankowski
37c82a3003
Update sidekiq to version 7 ( #34745 )
2025-05-26 15:32:41 +00:00
Claire
955e75e820
Fix premailer strategy when using CDN_HOST ( #34813 )
2025-05-26 13:19:19 +00:00
Claire
342290a9e0
Merge commit '198b59ca3ec45cbf6e73f53e1f39c7204d8a70c9' into glitch-soc/merge-upstream
2025-05-26 12:31:26 +02:00
Claire
706c8bf1a0
Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/embedded.html.haml`:
Upstream made a change to javascript tags next to lines changed in glitch-soc
because of the theming system.
Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
Upstream made a change to javascript tags next to lines changed in glitch-soc
because of the theming system.
Added the javascript entrypoint upstream added.
2025-05-25 15:11:58 +02:00
Claire
b031f65670
Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream
2025-05-25 14:51:59 +02:00
Claire
f49940db85
Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
...
Too many conflicts to list, because of webpack → vite migration.
2025-05-25 14:36:51 +02:00
Claire
e0f15a6875
Add cross-account quote to sample data ( #34791 )
2025-05-24 12:16:28 +00:00
diondiondion
3bf128e62a
Add dev sample data for post with quote + media ( #34787 )
2025-05-23 12:52:14 +00:00
