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
b9d25bde3e
Convert mix of JSON.parse and JSON.load_file ( #38242 )
2026-03-17 13:27:57 +00:00
Matt Jankowski
653161fecc
Convert remaining JSON.generate ( #38240 )
2026-03-16 17:18:16 +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
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
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
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
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
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
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
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
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
Claire
da60acced5
Add boost of remote quote post with fallback link to sample dev data ( #34771 )
2025-05-22 12:45:24 +00:00
Matt Jankowski
3a5e310a6d
Remove OTP_SECRET env configuration from setup ( #34757 )
2025-05-21 15:08:46 +00:00
Claire
dab31f7a88
Drop support for PostgreSQL 12 ( #34744 )
2025-05-20 14:48:29 +00:00
Claire
0ada6e4168
Bypass date of birth check in dev:populate_sample_data task ( #34733 )
2025-05-19 20:20:37 +00:00
Echo
c4f47adb49
Convert from Webpack to Vite ( #34450 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com >
2025-05-16 13:26:12 +00:00
Claire
0fda1f0e94
Merge commit '6c743831aab13a39f2020827f20933a51bc7cbc2' into glitch-soc/merge-upstream
2025-05-15 18:52:02 +02:00
Claire
ae281f31db
Add dev:populate_sample_data rake task to populate test data ( #34676 )
2025-05-15 08:51:07 +00:00
Claire
5321a553d5
Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Not a real conflict, upstream added a setting on a line adjacent to a
glitch-soc-only line.
Added upstream's new setting.
2025-05-14 13:38:23 +02:00
Claire
4e2aa78a56
Fix tootctl accounts create failing because of date-of-birth check ( #34663 )
2025-05-12 09:28:12 +00:00
Claire
8d98d91f33
Merge commit '22e2e7f02b2f25f30abd6a616bc3b0b543b30279' into glitch-soc/merge-upstream
2025-05-06 12:06:51 +02:00
Claire
41d00bc28b
Fix libvips being unconditionally required by tasks ( #34620 )
2025-05-06 09:45:32 +00:00
Claire
ff07676aee
Merge commit '24c25ec4f503eb1b27b4e417d15ea62b5b9ee9fb' into glitch-soc/merge-upstream
2025-05-03 18:03:42 +02:00
Essem
e96044f389
Update to Twemoji 15.1.0 ( #34321 )
2025-04-28 14:22:14 +00:00
Claire
4bea9a0a66
Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream
2025-03-07 18:34:27 +01:00
Damien Erambert
debe6c0545
Add emoji from Twemoji 15.0 to the emoji picker/completion ( #33395 )
2025-03-05 17:05:15 +00:00
Claire
19fa4cfcf2
Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream
2025-01-23 13:38:23 +01:00
Claire
a6fc776c6f
Change mastodon:setup to prevent overwriting already-configured servers ( #33684 )
2025-01-22 15:34:22 +00:00
Claire
297eb7c956
Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Upstream modified it while we quote upstream's within an otherwise different file.
Applied upstream's changes.
2025-01-18 12:42:17 +01:00
Claire
ab4874ff13
Further harden the warnings against changing encryption secrets ( #33631 )
2025-01-17 10:42:52 +00:00
