tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,816 Commits 5 Branches 0 Tags
83ea9b94de798a93ca06ea0629e4920e3421c4e5
Commit Graph
28816 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Jankowski 7543c90642 Use bundler version 2.6.3 (#33658) 2025-01-21 08:00:35 +00:00
renovate[bot] 004e120e02 Update dependency selenium-webdriver to v4.28.0 (#33667) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-21 07:59:52 +00:00
Claire c400122665 Merge pull request #2950 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 7f866daf63
 2025-01-20 23:52:49 +01:00
Eugen Rochko 89b7f8884a [Glitch] Add warning when selected and detected language is different in web UI 
Port 8962f11578 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-20 18:07:59 +01:00
Claire 08e7c4f3a7 Merge commit '7f866daf637e9303c7b503e0ed29ef8802fcb4c0' into glitch-soc/merge-upstream 2025-01-20 18:06:13 +01:00
renovate[bot] 7f866daf63 Update formatjs monorepo (#33652) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-20 10:36:25 +00:00
renovate[bot] 2deab346b3 Update dependency nokogiri to v1.18.2 (#33651) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-20 10:36:21 +00:00
renovate[bot] a0c76f6017 Update dependency i18n to v1.14.7 (#33650) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-20 10:36:19 +00:00
Claire ac59ed39dd Fix re-encoding of high-framerate VFR videos with FFmpeg 6+ (#33634) 2025-01-20 09:22:49 +00:00
Eugen Rochko 8962f11578 Add warning when selected and detected language is different in web UI (#33042) 2025-01-20 09:17:13 +00:00
github-actions[bot]andGitHub Actions 329a9e1ac1 New Crowdin Translations (automated) (#33643) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-20 08:59:23 +00:00
Claire 0d09884521 Merge pull request #2947 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 4bd969e4bb
 2025-01-18 15:01:00 +01:00
Claire 297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
 2025-01-18 12:42:17 +01:00
Nicholas La Roux 4bd969e4bb Fix broken CONTRIBUTING link in DEVELOPMENT (#33637) 2025-01-17 15:53:32 +00:00
Matt Jankowski bc63f2b908 Update CONTRIBUTING doc with various clarifications (#33517) 2025-01-17 15:38:06 +00:00
Claire ab4874ff13 Further harden the warnings against changing encryption secrets (#33631) 2025-01-17 10:42:52 +00:00
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]andGitHub Actions 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 0aa9bb8130
 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 da4e55eb17
 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]andGitHub Actions 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 c20824fa76
 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 e1d7efadc0
 2025-01-14 21:53:41 +01:00