Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream 20240115 #462

Merged
merged 22 commits into from
Jan 15, 2024
Merged

Upstream 20240115 #462

merged 22 commits into from
Jan 15, 2024

Conversation

kmycode
Copy link
Owner

@kmycode kmycode commented Jan 15, 2024 •
edited
Loading

本家のテストエラー修正を待つ

  • Bundler Audit / security
    • 指摘された脆弱性は現在Patched Versionが空欄で、修正されていない。こちらの対応のしようがない
    • 本家でも無視されているようなので、いったんignoreします
  • End to End Testing
    • 偶発的？（本家最新PR見ても失敗していないものがあった）
    • 本家が修正しました

mjankowski and others added 17 commits January 12, 2024 09:08
@mjankowski
Disable Rails/ApplicationController for HealthController (mastodo…
575ab08 
…n#28705)
@renchap
Improve lint-staged config (mastodon#28704)
923fc83
@mjankowski
Refresh instance counts in spec (fixes intermittent failure) (mastodo…
32eeca9 
…n#28698)
@mjankowski
Move followable_by coverage to suggestions (mastodon#28697)
cd37048
@mjankowski
Add JS console errors check (mastodon#28682)
df9e220
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28708)
b86083f 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Spec coverage for custom css endpoint (mastodon#28706)
7801db7
@mjankowski
Add coverage/bugfix for invalid appeal submission (mastodon#28703)
a906960
@renchap
Use the assets pipeline to load inert.css (mastodon#28701)
c6684aa
@renchap
Change icon SVG imports to use a default import (mastodon#28709)
608f66f
@mjankowski
Move followable by logic to suggestion class (mastodon#28710)
a90c134
@mjankowski
Disable Rails/LexicallyScopedActionFilter for inherited auth contro…
28fdf93 
…llers (mastodon#28711)
@MitarashiDango @ClearlyClaire
Fix Undo Announce activity is not sent, when not followed by the rebl…
2c05b8a 
…ogged post author (mastodon#18482)

Co-authored-by: Claire <[email protected]>
@ClearlyClaire
Fix RedownloadMediaWorker not being called on transient S3 failure (m…
1070804 
…astodon#28714)
@ClearlyClaire
Switch from 48px weight 600 material symbol icons to 24px weight 400 …
6bbcd93 
…icons (mastodon#28064)
@mjankowski
Use rubygems released version of omniauth-cas gem (mastodon#28719)
cc3ff66
@kmycode
Merge remote-tracking branch 'parent/main' into upstream-20240115
673e09d
@kmycode kmycode added this to the kb11.0 milestone Jan 15, 2024
@kmycode kmycode marked this pull request as draft January 15, 2024 02:28
@kmycode kmycode marked this pull request as ready for review January 15, 2024 10:34
@kmycode kmycode merged commit 90bd2a0 into kb_development Jan 15, 2024
48 checks passed
@kmycode kmycode deleted the upstream-20240115 branch January 15, 2024 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
upstream
Projects
None yet
Milestone
kb11.0
Development

Successfully merging this pull request may close these issues.
5 participants
@kmycode @mjankowski @renchap @MitarashiDango @ClearlyClaire