Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,016 Commits 74 Branches 58 Tags
02134172f1bd110e9c38ed2add528e0bca93277f
Commit Graph

26016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
02134172f1 Merge commit 'e770303968dc04d20dd5f3a5d7da3b9d7ba888fc' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Glitch-soc had different overrides, but upstream simply disabled the rules.
  Disabled them as well.
- `app/serializers/initial_state_serializer.rb`:
  Not really a conflict, again because of a rubocop comment.
 2025-08-22 22:33:11 +02:00
Claire
48a71e6ad2 Change glitch flavor to show approximate reply count by default (#3157) 2025-08-22 22:29:21 +02:00
renovate[bot]
e770303968 Update dependency rubyzip to v3.0.2 (#35845) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-21 11:40:40 +00:00
renovate[bot]
23de9c7e6c Update dependency vite-plugin-static-copy to v3.1.2 (#35846) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-21 11:33:11 +00:00
github-actions[bot]
f696f794cf New Crowdin Translations (automated) (#35844) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-21 07:42:45 +00:00
renovate[bot]
83f151947e Update dependency core-js to v3.45.1 (#35843) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-21 07:29:58 +00:00
Matt Jankowski
20a71a5479 Disable Metrics/* cops (#35000) 2025-08-20 17:04:36 +00:00
renovate[bot]
181134153d Update dependency ruby-vips to v2.2.5 (#35836) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-20 15:31:58 +00:00
Claire
45ec4c93c0 Fix display of quotes in threads in WebUI (#35834) 2025-08-20 14:39:58 +00:00
Matt Jankowski
50cf327819 Use debug? query method on httplog initializer check (#35833) 2025-08-20 12:06:35 +00:00
Echo
8268323d7f Status quote button (#35822) 2025-08-20 10:09:57 +00:00
github-actions[bot]
54da7ff12b New Crowdin Translations (automated) (#35829) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-20 08:31:57 +00:00
renovate[bot]
e28fe4199d Update dependency vite-plugin-pwa to v1.0.3 (#35830) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-20 08:09:02 +00:00
Claire
183e9d953b Merge pull request #3162 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8d3bca3bb8
 2025-08-19 21:43:34 +02:00
Claire
b7c9b881e3 Merge commit '8d3bca3bb8c84e1e3735eb71bdce7acac3779bff' into glitch-soc/merge-upstream 2025-08-19 21:01:33 +02:00
Claire
c0aa21f4ad Merge pull request #3161 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to f16f8b51b8
 2025-08-19 21:00:46 +02:00
Echo
72035d5faa [Glitch] Move language and visibility buttons above CW field 
Port f16f8b51b8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-19 19:14:23 +02:00
Echo
43034790a6 [Glitch] Composer Quote UI 
Port d4b2e7f771 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-19 19:13:58 +02:00
Claire
8d3bca3bb8 Fix serialization of quote policies in nested quotes (#35828) 2025-08-19 17:13:43 +00:00
Claire
71cee3e472 Merge commit 'f16f8b51b863d3fcadd17753004adbf8962ead01' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency adjacent to one that is only in glitch-soc.
  Updated as upstream did.
 2025-08-19 18:46:12 +02:00
Echo
f16f8b51b8 Move language and visibility buttons above CW field (#35824) 2025-08-19 15:29:10 +00:00
Claire
831a24ae15 Fix self-destruct scheduler behavior on some Redis setups (#35823) 2025-08-19 14:16:30 +00:00
Claire
736751e5de Change indexes on quotes to efficiently list quotes of a given account or quoted status (#35819) 2025-08-19 12:50:30 +00:00
renovate[bot]
421dbf9a7f Update opentelemetry-ruby (non-major) (#35784) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-19 07:07:46 +00:00
renovate[bot]
7ac16582be Update dependency prometheus_exporter to v2.3.0 (#35791) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-19 07:07:26 +00:00
renovate[bot]
5d24cb7514 Update dependency @vitejs/plugin-react to v5.0.1 (#35817) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-19 06:51:08 +00:00
renovate[bot]
a81b6beeca Update dependency vite to v7.1.3 (#35818) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-19 06:51:05 +00:00
github-actions[bot]
10dc66be64 New Crowdin Translations (automated) (#35816) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-19 06:49:37 +00:00
Matt Jankowski
ce813ad144 Avoid method that makes tokens while checking for tokens (#35815) 2025-08-19 06:49:34 +00:00
Claire
76b7092062 Merge pull request #3160 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 255d8f3f8c
 2025-08-18 22:56:03 +02:00
Alan
903eefd420 [Glitch] Update color alpha blending to use Sass color functions 
Port 95111e88e3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-18 22:12:05 +02:00
Claire
9871aeed20 [Glitch] Fix “Delete & Redraft” as well as “Edit” unexpectedly reseting quote policy 
Port c2fcf4183c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-18 22:06:33 +02:00
Claire
4ffcf7f7ed Merge commit '255d8f3f8c6ece6a9f1fce9ea901d71577b92099' into glitch-soc/merge-upstream 2025-08-18 22:05:19 +02:00
Echo
d4b2e7f771 Composer Quote UI (#35805) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-08-18 16:52:28 +00:00
Michael Stanclift
28bf811a07 Update Dockerfile to use Debian 'trixie' (#35768) 2025-08-18 16:45:31 +00:00
Claire
255d8f3f8c Fix e-mail confirmation bypassing username approval (#35806) 2025-08-18 16:37:13 +00:00
Alan
95111e88e3 Update color alpha blending to use Sass color functions (#35787) 2025-08-18 15:55:38 +00:00
Claire
c2fcf4183c Fix “Delete & Redraft” as well as “Edit” unexpectedly reseting quote policy (#35808) 2025-08-18 14:51:16 +00:00
Evаn Summers
f5754f2a36 Mention admin@localhost in DEVELOPMENT.md for non-Vagrant setups (#35704) 2025-08-18 14:13:44 +00:00
Claire
7ea5f622d3 Merge pull request #3159 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 72bd1ed4b3
 2025-08-18 15:42:55 +02:00
Claire
8d602df786 Merge commit '72bd1ed4b3df9188a1ad3e664c86fe2e928bd134' into glitch-soc/merge-upstream 2025-08-18 13:44:06 +02:00
Claire
59dbb17bfa Merge pull request #3158 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream 651e51a82e
 2025-08-18 13:43:17 +02:00
Claire
72bd1ed4b3 Fix updates to quote policy not being federated (#35804) 2025-08-18 08:34:45 +00:00
Matt Jankowski
9d15b85d3b Include update in the resources args for api/web/push_subscriptions route (#35801) 2025-08-18 07:35:56 +00:00
github-actions[bot]
a18e6199ef New Crowdin Translations (automated) (#35795) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-18 07:03:54 +00:00
renovate[bot]
83fcd1cf4f Update dependency rails-i18n to v8.0.2 (#35796) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-18 07:01:07 +00:00
Claire
1904d9617d Fix SCSS formatting 2025-08-17 21:17:06 +02:00
Echo
2a593bd89e [Glitch] Allow editing status quote policy 
Port 651e51a82e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-17 21:17:06 +02:00
Echo
8a7324d114 [Glitch] Move composer buttons to top 
Port 49a6e4cbb5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-17 21:17:06 +02:00
Echo
6c8a478273 [Glitch] Redirect on success for standalone compose 
Port 7cf53dbf63 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-17 21:17:06 +02:00