1
0
mirror of https://github.com/funamitech/mastodon synced 2024-11-27 06:18:53 +09:00
Commit Graph

23571 Commits

Author SHA1 Message Date
Claire
f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
2024-11-03 20:51:58 +01:00
Matt Jankowski
b06fd54c30
Update zeitwerk to version 2.7.1 (#32723) 2024-10-31 16:00:21 +00:00
Matt Jankowski
080b3b6ca5
Update rails-i18n to version 7.0.10 (#32719) 2024-10-31 15:13:20 +00:00
Matt Jankowski
b231c3c1bf
Drop support for ruby 3.1 (#32363) 2024-10-31 15:12:08 +00:00
Matt Jankowski
a20ac20302
Add model spec for Tombstone (#32697) 2024-10-31 13:27:47 +00:00
Joé Dupuis
917a799c67
Migrate from the deprecated azure-storage-blob to azure-blob (#32080)
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-10-31 10:46:07 +00:00
renovate[bot]
516c97a112
Update dependency node to v22 (#32689)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-31 10:42:18 +00:00
renovate[bot]
b3b3c0fe96
Update dependency core-js to v3.39.0 (#32707)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-31 10:28:20 +00:00
renovate[bot]
87aa3467cf
Update dependency selenium-webdriver to v4.26.0 (#32698)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-31 10:03:07 +00:00
renovate[bot]
75b2ac49fb
Update dependency strong_migrations to v2.0.2 (#32705)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-31 10:02:47 +00:00
github-actions[bot]
e78db58b65
New Crowdin Translations (automated) (#32708)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-31 10:01:05 +00:00
Eugen Rochko
c2b498a2b0
Fix IDs not being serialized as strings in annual reports API (#32710) 2024-10-31 09:38:00 +00:00
Renato "Lond" Cerqueira
01e25af2e3
Fix 'unknown' media attachment rendering in detailed view (#32713) 2024-10-31 09:37:31 +00:00
Emelia Smith
e1b7382ea6
Add userinfo oauth endpoint (#32548) 2024-10-30 14:38:10 +00:00
github-actions[bot]
0a599d08d8
New Crowdin Translations (automated) (#32695)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-30 10:02:02 +00:00
renovate[bot]
110aa0aa28
Update workbox monorepo to v7.3.0 (#32691)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-30 09:09:10 +00:00
renovate[bot]
7f743f3c81
Update dependency libvips to v8.16.0 (#32679)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-30 08:40:49 +00:00
Claire
742eb549ab
Fix preview cards with long titles erroneously causing layout changes (#32678) 2024-10-30 08:34:56 +00:00
Matt Jankowski
babee06794
Add coverage for StatusTrend and PreviewCardTrend models, add locales class method to RankedTrend (#32688) 2024-10-29 15:46:32 +00:00
Matt Jankowski
df3b954720
Add DomainHelpers spec support module for DNS/MX stub (#32690) 2024-10-29 15:35:25 +00:00
Nathan Sparrow
de1d8dc63a
Embed modal mobile fix (#32641) 2024-10-29 15:12:35 +00:00
renovate[bot]
311d2b7f3a
Update dependency fog-core to '<= 2.6.0' (#32660)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-29 14:17:28 +00:00
David Roetzel
9de3fd60a0
Add telemetry for status / bio formatting (#32677) 2024-10-29 10:10:17 +00:00
github-actions[bot]
244aaf9a38
New Crowdin Translations (automated) (#32687)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-29 09:29:22 +00:00
Emelia Smith
d94a367aeb
Add test coverage for POST /api/v2/media's max description length (#32683) 2024-10-29 09:25:38 +00:00
Matt Jankowski
b107fc2e65
Use nil for timestamp column in admin/confirmations spec (#32682) 2024-10-29 08:54:30 +00:00
Matt Jankowski
dc077437d5
Misc gem version bumps (#32684) 2024-10-29 08:37:43 +00:00
renovate[bot]
cff1846f80
Update babel monorepo to v7.26.0 (#32659)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-28 14:55:45 +00:00
Matt Jankowski
6f5eb22135
Mailer header partial access cleanup (#32585) 2024-10-28 13:41:56 +00:00
Hugo Gameiro
b1d3c64525
Fix and improve batch attachment deletion handling when using OpenStack Swift (#32637) 2024-10-28 13:32:56 +00:00
Emelia Smith
dc0b1948be
Feat: Implement interaction modal for Polls (#32609) 2024-10-28 13:27:37 +00:00
github-actions[bot]
0426cb78f7
New Crowdin Translations (automated) (#32589)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-28 13:23:13 +00:00
renovate[bot]
6a5a59c28c
Update dependency @formatjs/cli to v6.3.5 (#32675)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-28 13:21:24 +00:00
renovate[bot]
c3919289d2
Update DefinitelyTyped types (non-major) (#32674)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-28 13:21:01 +00:00
renovate[bot]
48f6f46072
Update dependency react-select to v5.8.2 (#32661)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-28 13:20:47 +00:00
Matt Jankowski
d547bf2f1e
Update rails to version 7.1.4.2 (#32670) 2024-10-28 07:37:32 +00:00
Matt Jankowski
1edb527072
Enhance coverage for StatusPin model (#32515) 2024-10-28 07:34:58 +00:00
Jonny Saunders
9074c1fac9
Use likes and shares totalItems on status creations and updates (#32620) 2024-10-28 04:55:18 +00:00
Claire
e44a800887
Fix missing CSS for CW margins (#2891) 2024-10-27 21:08:59 +01:00
Claire
40b3c206e4
Change Content Warning design to match upstream's (#2890) 2024-10-27 16:08:01 +01:00
Claire
eb68d81013
Merge pull request #2889 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 77cd16f4ee
2024-10-26 22:47:10 +02:00
Claire
1d3d549e96 [Glitch] Redesign Content Warning and filters
Port 393f0a0159 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-26 14:09:46 +02:00
renovate[bot]
e8d23f6bcb [Glitch] Update eslint (non-major)
Port 11a63b2db6 to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-26 14:00:09 +02:00
Claire
8a222b3951 Fix assets build failure on glitch-soc 2024-10-26 13:54:36 +02:00
Eugen Rochko
227bf77252 [Glitch] Change design of rich text elements in web UI
Port d11231a420 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-26 13:53:25 +02:00
David Roetzel
50a40d1b2f [Glitch] Do not change follow counters when already following
Port 029c99bd7b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-26 13:50:30 +02:00
Emelia Smith
28287eb3b2 [Glitch] Fix 'unknown' media attachment type rendering
Port 346cdb998c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-26 13:49:07 +02:00
Renaud Chaput
d304540ebc [Glitch] Replace execCommand for copying text with the modern clipboard API
Port fb6d7ed475 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-26 13:47:22 +02:00
Claire
8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
2024-10-26 13:38:07 +02:00
renovate[bot]
77cd16f4ee
Update dependency opentelemetry-instrumentation-active_job to v0.7.8 (#32657)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-25 09:44:02 +00:00