Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-26 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,982 Commits 74 Branches 58 Tags
4ffcf7f7ed7450386b40603881d2c4fc632864aa
Commit Graph

25982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
4ffcf7f7ed Merge commit '255d8f3f8c6ece6a9f1fce9ea901d71577b92099' into glitch-soc/merge-upstream 2025-08-18 22:05:19 +02: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
Claire
80bc5ab5ef [Glitch] Fix reply indicator displaying wrong avatar in rare cases 
Port 63d3f28b20 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-17 20:58:11 +02:00
Echo
fd2420891c [Glitch] Prevent props being added as HTML attributes 
Port bf15b1d65d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-17 20:57:18 +02: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
Claire
add059205f Merge pull request #3156 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ce1680e6f9
 2025-08-17 20:50:16 +02:00
github-actions[bot]
25f1a515f8 New Crowdin Translations (automated) (#35788) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-15 07:12:01 +00:00
Matt Jankowski
4de21056ff Update sidekiq to version 8.0.7 (#34824) 2025-08-14 15:25:31 +00:00
Echo
651e51a82e Allow editing status quote policy (#35762) 2025-08-14 15:04:32 +00:00
Claire
a2cddb9eac Disallow making private posts quotable (#35780) 2025-08-14 13:58:25 +00:00
Claire
b0ce1ce49d Fix tootctl admin create not bypassing reserved username checks (#35779) 2025-08-14 13:35:19 +00:00
renovate[bot]
ac0581fd22 Update devDependencies (non-major) (#35660) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-08-14 08:36:38 +00:00
Matt Jankowski
93923a4af2 First pass coverage addition for antispam class (#35771) 2025-08-14 07:57:18 +00:00
renovate[bot]
9fc81adc7b Update opentelemetry-ruby (non-major) (#35777) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-14 07:51:51 +00:00
renovate[bot]
734dbbcb14 Update dependency rubocop-rails to v2.33.3 (#35766) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-14 07:35:12 +00:00
renovate[bot]
2112416761 Update dependency @rails/ujs to v7.1.502 (#35772) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-14 07:34:30 +00:00
renovate[bot]
c0f64a6603 Update dependency rails to v8.0.2.1 (#35776) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-14 07:34:27 +00:00
Claire
e2e19544ae Update Vagrantfile (#35765) 2025-08-13 20:45:10 +00:00
Claire
2648bbdc51 Add PUT /api/v1/statuses/:status_id/interaction_policy (#35769) 2025-08-13 15:51:16 +00:00
Echo
49a6e4cbb5 Move composer buttons to top (#35749) 2025-08-13 14:09:45 +00:00
Echo
7cf53dbf63 Redirect on success for standalone compose (#35763) 2025-08-13 13:52:29 +00:00
renovate[bot]
613cbf720c Update dependency eslint-plugin-jsdoc to v54 (#35760) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-13 07:28:21 +00:00
github-actions[bot]
bce4a572cd New Crowdin Translations (automated) (#35759) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-13 07:26:03 +00:00
Claire
c893b82ace Remove unnecessary limitation on manual build-security workflow (#35752) 2025-08-13 07:12:11 +00:00
renovate[bot]
eda8ddddd6 Update dependency json-schema to v6 (#35754) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 16:38:54 +00:00
Claire
63d3f28b20 Fix reply indicator displaying wrong avatar in rare cases (#35756) 2025-08-12 16:16:03 +00:00
renovate[bot]
783b33e2da Update dependency pino to v9.8.0 (#35722) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 13:54:40 +00:00
renovate[bot]
5847117573 Update dependency eslint-plugin-jsdoc to v53 (#35742) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 13:54:22 +00:00
Claire
258e5c4938 Fix interaction policy changes in implicit updates not being saved (#35751) 2025-08-12 12:19:29 +00:00
renovate[bot]
69ee043f9d Update dependency rspec-rails to v8.0.2 (#35750) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 09:53:52 +00:00
renovate[bot]
28b5477c6f Update dependency rubocop-rails to v2.33.1 (#35747) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 09:27:07 +00:00
Matt Jankowski
5ee83a680b Update stoplight to version 5.3.1 (#35129) 2025-08-12 08:15:22 +00:00
renovate[bot]
d9d7914a8d Update dependency vite to v7.1.2 (#35746) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 07:44:48 +00:00
github-actions[bot]
ca3d67e88d New Crowdin Translations (automated) (#35745) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-12 07:40:37 +00:00
Matt Jankowski
61f0ce654f Update rubocop-rails to version 2.33.0 (#35741) 2025-08-12 07:29:02 +00:00
Renaud Chaput
379f12ea00 Update to Vite 7 (#35598) 2025-08-11 12:35:36 +00:00