24350 Commits

Author SHA1 Message Date
Claire
b37e48d5c8
Revert "Update dependency aws-sdk-s3 to v1.178.0 (#33611)" (#33628) 2025-01-17 10:33:03 +00:00
Matt Jankowski
5be938e661
Migrate visibility interaction checks on statuses to request spec (#33622) 2025-01-17 10:06:52 +00:00
github-actions[bot]
1c23ebd62f
New Crowdin Translations (automated) (#33626)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-17 10:05:41 +00:00
renovate[bot]
531ca4b968
Update dependency tzinfo-data to v1.2025.1 (#33625)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-17 09:35:34 +00:00
Claire
092e60eb7d
Change activity distribution error handling to skip retrying for deleted accounts (#33617) 2025-01-17 09:12:59 +00:00
renovate[bot]
febdfefafe
Update formatjs monorepo (#33627)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-17 08:57:11 +00:00
Christian Schmidt
a3baae0b99
API for updating attribution domains (#32730) 2025-01-17 08:18:55 +00:00
Matt Jankowski
3af6739f21
Add coverage for AnnualReport.prepare method (#33618) 2025-01-16 15:45:48 +00:00
Matt Jankowski
a19141441d
Move clear environment portion of mastodon:setup to private method (#33616) 2025-01-16 15:45:02 +00:00
renovate[bot]
29b355b699
Update dependency concurrent-ruby to v1.3.5 (#33610)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-16 15:24:31 +00:00
renovate[bot]
9e2f930eed
Update dependency aws-sdk-s3 to v1.178.0 (#33611)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-16 15:23:37 +00:00
renovate[bot]
da208771b9
Update opentelemetry-ruby (non-major) (#33613)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-16 15:23:32 +00:00
Matt Jankowski
69b8a0b9bf
Collect errors in setup rake task (#33603) 2025-01-16 14:58:59 +00:00
Claire
160019235b
Merge pull request #2945 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 0aa9bb8130b77b01f6a08c64b7e93876d892868b
2025-01-16 12:26:03 +01:00
Claire
ad3bb614f0 Merge commit '0aa9bb8130b77b01f6a08c64b7e93876d892868b' into glitch-soc/merge-upstream 2025-01-16 12:13:56 +01:00
Claire
0aa9bb8130
Bump version to v4.4.0-alpha.2 (#33615) 2025-01-16 11:02:54 +00:00
Claire
4cfa5c14c0
Merge pull request #2944 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to da4e55eb17e459fbc6d1a19fac3303508324324c
2025-01-16 11:54:26 +01:00
Claire
f6a0cd9d1a Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream 2025-01-16 11:16:53 +01:00
Claire
da4e55eb17
Merge commit from fork 2025-01-16 11:10:08 +01:00
github-actions[bot]
4a44c47982
New Crowdin Translations (automated) (#33609)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-16 09:13:39 +00:00
Matt Jankowski
3db8498903
Fix Style/MutableConstant cop (#33602) 2025-01-16 09:09:06 +00:00
Matt Jankowski
998cf0dd53
Convert auth/setup spec controller->system/request (#33604) 2025-01-16 09:03:46 +00:00
Matt Jankowski
72abf05269
Add "needs refresh" scenario to api/v1/polls request spec (#33608) 2025-01-16 09:00:04 +00:00
Claire
6394261d58
Merge pull request #2942 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to c20824fa760061cf8fba258dbbd6b0a615df4749
2025-01-15 22:20:30 +01:00
Claire
ad71a8d1f7 Merge commit 'c20824fa760061cf8fba258dbbd6b0a615df4749' into glitch-soc/merge-upstream 2025-01-15 19:32:04 +01:00
Matt Jankowski
c20824fa76
Promote Style/WordArray rule out of todo into main config (#33580) 2025-01-15 14:29:14 +00:00
renovate[bot]
ea01ecd441
Update dependency opentelemetry-instrumentation-rails to v0.34.1 (#33595)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-15 12:49:12 +00:00
renovate[bot]
2a0951e987
Update dependency stackprof to v0.2.27 (#33596)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-15 12:48:52 +00:00
fusagiko / takayamaki
1ae574e32a
Enable parallel execution for linting tasks in HAML workflows (#33593) 2025-01-15 07:48:26 +00:00
Matt Jankowski
9f03e5b53a
Expand coverage of admin/*blocks areas (#33594) 2025-01-15 07:47:34 +00:00
Plastikmensch
e489410b0f
Fix attachment list in conversation component (#2941)
`media` is no longer part of `StatusContent`, so the attachment list wasn't shown in the private mentions column.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2025-01-15 08:18:39 +01:00
Claire
dc2ce2b305
Merge pull request #2940 from Plastikmensch/fix-media-attachments-in-report-modal
Fix media attachments in report modal
2025-01-15 08:17:58 +01:00
Plastikmensch
5395154832
Fix media attachments in report modal
Media attachments weren't shown in the report modal since they were passed as `media` to `StatusContent`, but `StatusContent` doesn't use the media prop anymore.

Instead match the file with vanilla.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2025-01-14 23:47:09 +01:00
Claire
ae49d73f58
Merge pull request #2939 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to e1d7efadc04dd0826c6bcfe43325688566e13881
2025-01-14 21:53:41 +01:00
Claire
09bd5aa156 [Glitch] Redirect new users to onboarding
Port e9462960a7cf416b9e459d599a0f2cc8c5b070f0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-01-14 20:47:40 +01:00
Claire
563ff91cf8 [Glitch] Use final specification for new WebPush subscriptions in web interface
Port e2f085e2b2cec08dc1f5ae825730c2a3bf62e054 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-01-14 20:46:21 +01:00
Claire
ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
2025-01-14 20:38:32 +01:00
Matt Jankowski
68c9f91ccb
Treat non-null but blank account domain as local (#33576) 2025-01-14 17:40:55 +00:00
Michael Stanclift
e1d7efadc0
Fix libyaml missing from Dockerfile build stage (#33591) 2025-01-14 16:35:58 +00:00
renovate[bot]
bfe73e153d
Update dependency postcss to v8.5.1 (#33586)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-14 16:34:26 +00:00
Matt Jankowski
50013b10a5
Add Status::Visibility concern to hold visibility logic (#33578) 2025-01-14 14:32:57 +00:00
Matt Jankowski
7c56517c7c
Move mastodon version config to config_for yml (#33577) 2025-01-14 14:32:29 +00:00
renovate[bot]
87849d739e
Update dependency rspec-github to v3 (#33589)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-14 14:17:11 +00:00
renovate[bot]
6356870dae
Update dependency sass to v1.83.4 (#33585)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-14 14:14:03 +00:00
renovate[bot]
7b608b41f2
Update dependency @babel/plugin-transform-nullish-coalescing-operator to v7.26.6 (#33584)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-14 14:13:58 +00:00
Claire
e9462960a7
Redirect new users to onboarding (#33471) 2025-01-14 13:10:48 +00:00
Claire
e2f085e2b2
Use final specification for new WebPush subscriptions in web interface (#33587) 2025-01-14 10:42:06 +00:00
Matt Jankowski
a9a8b6b701
Expand coverage of admin/trends/* areas (#33581) 2025-01-14 10:27:21 +00:00
S1m
4a2813158d
Add support for standard webpush (#33528)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-01-14 09:14:00 +00:00
github-actions[bot]
ee4edbb94f
New Crowdin Translations (automated) (#33582)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-14 08:44:58 +00:00