Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-27 21:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,307 Commits 74 Branches 58 Tags
2085b0b53abbeef53a88a453ec09170e4742a415
Commit Graph

1448 Commits

Author SHA1 Message Date
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
Claire
02ac18da51 Change display of quote posts to strip fallback link and preview cards (#34772) 2025-05-23 06:53:04 +00:00
Renaud Chaput
ef1bf8e9f2 Fix polyfills naming and tag missing a source (#34768) 2025-05-22 12:54:47 +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
Renaud Chaput
83dd09d4dc Fix JS polyfills missing after the Vite switch (#34758) 2025-05-21 20:11:01 +00:00
Matt Jankowski
f1a6f4333a Remove redis-namespace gem (#34742) 2025-05-21 15:20:17 +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
6d6263ce07 Drop redis namespace code (except for Rails cache) (#34665) 2025-05-20 13:02:09 +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
49e9a1fe4e Merge commit 'fbe9728f36998d3788e71c56bacc803c857fc422' into glitch-soc/merge-upstream 
Conflicts:
- `docker-compose.yml`:
  Conflict because of different repo names. Updated version.
 2025-05-06 16:30:33 +02:00
Claire
fbe9728f36 Bump version to v4.3.8 (#34626) 2025-05-06 14:17:07 +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
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00
Essem
e96044f389 Update to Twemoji 15.1.0 (#34321) 2025-04-28 14:22:14 +00:00
Eugen Rochko
bd9223f0b9 Fix tootctl search deploy --only-mapping not updating index settings (#34566) 2025-04-28 13:02:41 +00:00
Eugen Rochko
a97647158c Add REST API for featuring and unfeaturing a hashtag (#34489) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-04-25 15:12:05 +00:00
Claire
3628717595 Merge commit '3159f3b2f6ed444d4f247c5e7864e4c41ca285df' into glitch-soc/merge-upstream 2025-04-21 15:47:21 +02:00
Eugen Rochko
c01d219c12 Add --only-mapping option to tootctl search deploy (#34466) 2025-04-17 09:09:03 +00:00
Claire
4e6c7fba78 Merge commit '678c8dfeec2c221cf609b924161dc03cebfa41e1' into glitch-soc/merge-upstream 2025-04-10 17:50:04 +02:00
Matt Jankowski
4c2f64907b Remove deprecated Import model (#34371) 2025-04-10 12:49:24 +00:00
Claire
99e3ea232f Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream 2025-04-04 20:00:24 +02:00
David Roetzel
e2ef173b82 Refactoring: Move SignatureVerificationError into Mastodon namespace (#34342) 2025-04-02 07:54:29 +00:00
Claire
e0406fcf02 Merge commit 'e8270e2807727e1cf6a47a40442b3038c5bca858' into glitch-soc/merge-upstream 
Conflicts:
- `.eslintrc.js`:
  Upstream moved it to `eslint.config.mjs`.
  Ported the glitch-soc changes there.
- `yarn.lock`:
  Upstream updated dependencies close to glitch-soc-only dependencies.
  Ported upstream's changes.
 2025-04-01 20:59:34 +02:00
Claire
9686ae7060 Fix static version of animated PNG emojis not being properly extracted (#34337) 2025-04-01 08:53:49 +00:00
Claire
9c5c86c947 Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream 2025-03-26 18:18:07 +01:00
Claire
c93b2c6809 Add new filter action to blur media (#34256) 2025-03-26 07:31:05 +00:00