Skip to content

dev<-master - #7165

Merged
TinyKitten merged 2 commits into
devfrom
chore/dev-from-master
Oct 2, 2026
Merged

TinyKitten merged 2 commits into
devfrom
chore/dev-from-master

Conversation

@TinyKitten

Copy link
Copy Markdown
Member

概要

本番リリース v10.18.0 後に master ブランチへ積まれた差分を dev ブランチへ同期するマージPRです。master と dev の履歴を揃えることが目的で、コードの新規変更は含みません。

変更の種類

  • バグ修正
  • 新機能
  • リファクタリング
  • ドキュメント
  • CI/CD
  • その他

変更内容

master に積まれていて dev に未反映の以下 2 件のコミットを dev に取り込みます。

  • Merge pull request v10.18.0🎉 #7164 from TrainLCD/release/v10.18.0
  • v10.18.0 をリリース

テスト

  • npm run lint が通ること
  • npm test が通ること
  • npm run typecheck が通ること

本PRはコード変更を含まないマージPRのため、当ブランチ上で lint / test / typecheck は実行していません。取り込まれる各コミットは元の PR 時点および master への取り込み時点で検証済みです。

関連Issue

なし(リリース後の同期PR)。

スクリーンショット(任意)

なし(コード変更を含まないマージPR)。

🤖 Generated with Claude Code

TinyKitten and others added 2 commits October 2, 2026 23:53
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Oct 2, 2026

Copy link
Copy Markdown
Contributor

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Essentials

Run ID: 56a80ed0-9750-407a-922c-8cf88000727d

📥 Commits

Reviewing files that changed from the base of the PR and between 3ec83e0 and 3168951.

⛔ Files ignored due to path filters (1)
  • package-lock.json is excluded by !**/package-lock.json
📒 Files selected for processing (5)
  • android/app/build.gradle
  • android/wearable/build.gradle.kts
  • app.config.ts
  • ios/TrainLCD.xcodeproj/project.pbxproj
  • package.json
 _______________________________________________________________________________________________________________________________
< Always code as if the person who ends up maintaining your code is a violent psychopath who knows where you live. - John Woods >
 -------------------------------------------------------------------------------------------------------------------------------
  \
   \   (\__/)
       (•ㅅ•)
       /   づ
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Autopilot is currently an internal CodeRabbit preview.


Comment @coderabbitai help to get the list of available commands.

@TinyKitten
TinyKitten merged commit a41d127 into dev Oct 2, 2026
12 of 13 checks passed
@TinyKitten
TinyKitten deleted the chore/dev-from-master branch October 2, 2026 14:57
@TinyKitten TinyKitten mentioned this pull request Oct 4, 2026
4 of 9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant