gitnira · gitnira · Jul 2, 2025 · Jul 2, 2025
diff --git a/.devcontainer/compose.yaml b/.devcontainer/compose.yaml
@@ -9,7 +9,6 @@ services:
     environment:
       RAILS_ENV: development
       NODE_ENV: development
-      VITE_RUBY_HOST: 0.0.0.0
       BIND: 0.0.0.0
       BOOTSNAP_CACHE_DIR: /tmp
       REDIS_HOST: redis
@@ -23,12 +22,11 @@ services:
       ES_PORT: '9200'
       LIBRE_TRANSLATE_ENDPOINT: http://libretranslate:5000
       LOCAL_DOMAIN: ${LOCAL_DOMAIN:-localhost:3000}
-      VITE_DEV_SERVER_PUBLIC: ${VITE_DEV_SERVER_PUBLIC:-localhost:3036}
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
     ports:
       - '3000:3000'
-      - '3036:3036'
+      - '3035:3035'
       - '4000:4000'
     networks:
       - external_network

diff --git a/.env.production.sample b/.env.production.sample
@@ -43,6 +43,7 @@ ES_PASS=password
 # Make sure to use `bundle exec rails secret` to generate secrets
 # -------
 SECRET_KEY_BASE=
+OTP_SECRET=
 
 # Encryption secrets
 # ------------------

diff --git a/.env.test b/.env.test
@@ -3,6 +3,8 @@ NODE_ENV=production
 # Federation
 LOCAL_DOMAIN=cb6e6126.ngrok.io
 LOCAL_HTTPS=true
+# Elasticsearch
+ES_PREFIX=test
 
 # Secret values required by ActiveRecord encryption feature
 # Use `bin/rails db:encryption:init` to generate fresh secrets

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: https://fantia.jp/fanclubs/484677
diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yml b/.github/ISSUE_TEMPLATE/1.bug_report.yml
@@ -0,0 +1,74 @@
+name: バグ報告
+description: kmyblueのバグ報告（ただし情報改竄、秘密情報の漏洩、システムの破損などが発生するバグは、こちらではなく「Security」タブよりセキュリティインシデントとして報告してください）
+labels: [bug]
+body:
+  - type: textarea
+    attributes:
+      label: バグの再現手順
+      description: どのように操作したらバグが発生したのか、バグが発生する直前までの手順を順番に詳しく教えてください
+      value: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 期待する動作
+      description: どのように動いてほしかったですか？
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 実際の動作
+      description: どのようなバグが発生しましたか？
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 詳しい情報
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: バグが発生したkmyblueサーバーのドメイン
+      description: サーバー固有の問題の可能性もありますので、プライバシー上可能な範囲内で、できるだけ書いてください
+      placeholder: kmy.blue
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: バグが発生したkmyblueのバージョン
+      description: |
+        Mastodonではなくkmyblueのバージョンを記述してください。例えばバージョン表記が `v4.2.0+kmyblue.5.1-LTS` の場合、バージョンは `5.1`になります
+
+        バージョンは、PCだと画面左下、スマホだと概要画面の一番下に書いてあります
+      placeholder: '5.1'
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: ブラウザの名前
+      description: |
+        ブラウザの名前を書いてください。可能であればバージョンも併記してください
+      placeholder: Firefox 105.0.3
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: OS
+      description: |
+        あなたのOSと、できればバージョンも教えてください。スマホの場合は、「Android」「iPhone」にバージョンをつけてください
+      placeholder: Windows11
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: その他の詳細情報
+      description: |
+        あなたの環境が特殊な場合、詳しいことを教えてください（例: VPS、tor、学内LANなど）
+
+        サーバー管理者の場合は、Ruby、Node.jsのバージョン、Cloudflareの使用可否なども可能なら書いてください
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/2.feature_request.yml b/.github/ISSUE_TEMPLATE/2.feature_request.yml
@@ -0,0 +1,16 @@
+name: 機能要望
+description: 機能の提案
+labels: [enhancement]
+body:
+  - type: textarea
+    attributes:
+      label: 欲しい機能
+      description: 欲しい機能の詳細を書いてください
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 必要性
+      description: この機能はあなたにとってなぜ必要でしょうか？どういった状況で使われるものですか？
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/3.spec_change_request.yml b/.github/ISSUE_TEMPLATE/3.spec_change_request.yml
@@ -0,0 +1,28 @@
+name: 仕様変更・改善要望
+description: 既存の仕様や挙動変更の要望
+labels: [specchange]
+body:
+  - type: markdown
+    attributes:
+      value: 意図したものとは明らかに異なる挙動をしているものはバグとして、もともと仕様として決められた動きをしているものを変更したいときはこちらでお願いします
+  - type: textarea
+    attributes:
+      label: 挙動を変更してほしい機能や動作
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 現在の挙動
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 変更してほしい新しい挙動
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 必要性
+      description: この変更はあなたにとってなぜ必要でしょうか？どういった状況で使われるものですか？
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/3.troubleshooting.yml b/.github/ISSUE_TEMPLATE/3.troubleshooting.yml
@@ -50,7 +50,7 @@ body:
       label: Mastodon version
       description: |
         This is displayed at the bottom of the About page, eg. `v4.4.0-alpha.1`
-      placeholder: v4.4.0-beta.1
+      placeholder: v4.3.0
     validations:
       required: false
   - type: textarea
@@ -60,9 +60,9 @@ body:
         Details about your environment, like how Mastodon is deployed, if containers are used, version numbers, etc.
       value: |
         Please at least include those informations:
-        - Operating system: (eg. Ubuntu 24.04.2)
-        - Ruby version: (from `ruby --version`, eg. v3.4.4)
-        - Node.js version: (from `node --version`, eg. v22.16.0)
+        - Operating system: (eg. Ubuntu 22.04)
+        - Ruby version: (from `ruby --version`, eg. v3.4.1)
+        - Node.js version: (from `node --version`, eg. v20.18.0)
     validations:
       required: false
   - type: textarea

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1 @@
-blank_issues_enabled: false
-contact_links:
-  - name: GitHub Discussions
-    url: https://github.com/mastodon/mastodon/discussions
-    about: Please ask and answer questions here.
+blank_issues_enabled: true
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -25,12 +25,26 @@
         'tesseract.js', // Requires code changes
         'react-hotkeys', // Requires code changes
 
+        // Requires Webpacker upgrade or replacement
+        '@svgr/webpack',
+        '@types/webpack',
+        'babel-loader',
+        'compression-webpack-plugin',
+        'css-loader',
+        'imports-loader',
+        'mini-css-extract-plugin',
+        'postcss-loader',
+        'sass-loader',
+        'terser-webpack-plugin',
+        'webpack',
+        'webpack-assets-manifest',
+        'webpack-bundle-analyzer',
+        'webpack-dev-server',
+        'webpack-cli',
+
         // react-router: Requires manual upgrade
         'history',
         'react-router-dom',
-
-        // react-spring: Requires manual upgrade when upgrading react
-        '@react-spring/web',
       ],
       matchUpdateTypes: ['major'],
       dependencyDashboardApproval: true,
@@ -39,6 +53,7 @@
       // Require Dependency Dashboard Approval for major version bumps of these Ruby packages
       matchManagers: ['bundler'],
       matchPackageNames: [
+        'rack', // Needs to be synced with Rails version
         'strong_migrations', // Requires manual upgrade
         'sidekiq', // Requires manual upgrade
         'sidekiq-unique-jobs', // Requires manual upgrades and sync with Sidekiq version

diff --git a/.github/workflows/bundler-audit.yml b/.github/workflows/bundler-audit.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - 'main'
+      - 'kb*'
+      - 'upstream-*'
+      - 'releases/*'
       - 'stable-*'
     paths:
       - 'Gemfile*'

diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml
@@ -4,10 +4,16 @@ on:
   push:
     branches:
       - 'main'
+      - 'kb*'
+      - 'upstream-*'
+      - 'releases/*'
       - 'stable-*'
   pull_request:
     branches:
       - 'main'
+      - 'kb*'
+      - 'upstream-*'
+      - 'releases/*'
       - 'stable-*'
 
 env:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -5,10 +5,16 @@ on:
   push:
     branches:
       - 'main'
+      - 'kb*'
+      - 'upstream-*'
+      - 'releases/*'
       - 'stable-*'
   pull_request:
     branches:
       - 'main'
+      - 'kb*'
+      - 'upstream-*'
+      - 'releases/*'
       - 'stable-*'
   schedule:
     - cron: '22 6 * * 1'

diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - 'main'
+      - 'kb*'
+      - 'upstream-*'
+      - 'releases/*'
       - 'stable-*'
   pull_request:
 

diff --git a/.github/workflows/lint-css.yml b/.github/workflows/lint-css.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - 'main'
+      - 'kb*'
+      - 'upstream-*'
+      - 'releases/*'
       - 'stable-*'
     paths:
       - 'package.json'

diff --git a/.github/workflows/lint-haml.yml b/.github/workflows/lint-haml.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - 'main'
+      - 'kb*'
+      - 'upstream-*'
+      - 'releases/*'
       - 'stable-*'
     paths:
       - '.github/workflows/haml-lint-problem-matcher.json'

diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - 'main'
+      - 'kb*'
+      - 'upstream-*'
+      - 'releases/*'
       - 'stable-*'
     paths:
       - 'package.json'

diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - 'main'
+      - 'kb*'
+      - 'upstream-*'
+      - 'releases/*'
       - 'stable-*'
     paths:
       - 'Gemfile*'

diff --git a/.github/workflows/test-js.yml b/.github/workflows/test-js.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - 'main'
+      - 'kb*'
+      - 'upstream-*'
+      - 'releases/*'
       - 'stable-*'
     paths:
       - 'package.json'
@@ -40,4 +43,4 @@ jobs:
         uses: ./.github/actions/setup-javascript
 
       - name: JavaScript testing
-        run: yarn test:js
+        run: yarn jest --reporters github-actions summary
diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
@@ -5,6 +5,9 @@ on:
   push:
     branches:
       - 'main'
+      - 'kb*'
+      - 'upstream-*'
+      - 'releases/*'
       - 'stable-*'
     paths:
       - 'Gemfile*'