From 2f52f91762acbef30d594df9dde7c8bd65693532 Mon Sep 17 00:00:00 2001 From: "Yasuko Ohba (nay3)" Date: Sun, 22 Mar 2026 11:31:58 +0900 Subject: [PATCH 01/11] Bump up version to 4.0.1 --- config/initializers/kozuchi_version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/kozuchi_version.rb b/config/initializers/kozuchi_version.rb index ca5ddfa3..9d7718cb 100644 --- a/config/initializers/kozuchi_version.rb +++ b/config/initializers/kozuchi_version.rb @@ -3,6 +3,6 @@ KOZUCHI_MAJOR_VERSION = 4 KOZUCHI_MIDDLE_VERSION = 0 -KOZUCHI_MINORE_VERSION = 0 +KOZUCHI_MINORE_VERSION = 1 KOZUCHI_VERSION = "#{KOZUCHI_MAJOR_VERSION}.#{KOZUCHI_MIDDLE_VERSION}.#{KOZUCHI_MINORE_VERSION}" From 4c7a7226c07ad9451767897ad53858cb14d6d344 Mon Sep 17 00:00:00 2001 From: "Yasuko Ohba (nay3)" Date: Sun, 22 Mar 2026 17:41:09 +0900 Subject: [PATCH 02/11] =?UTF-8?q?dependabot=20=E3=81=AE=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=81=A8=E8=87=AA=E5=8B=95=E3=83=9E=E3=83=BC=E3=82=B8=E3=83=AF?= =?UTF-8?q?=E3=83=BC=E3=82=AF=E3=83=95=E3=83=AD=E3=83=BC=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/dependabot.yml | 19 ++++++++++++++++ .github/workflows/dependabot-auto-merge.yml | 24 +++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/dependabot-auto-merge.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..3d7dd726 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,19 @@ +version: 2 +updates: + - package-ecosystem: bundler + directory: "/" + schedule: + interval: monthly + groups: + minor-and-patch: + patterns: ["*"] + update-types: ["minor", "patch"] + + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: monthly + groups: + minor-and-patch: + patterns: ["*"] + update-types: ["minor", "patch"] diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml new file mode 100644 index 00000000..7878d0b7 --- /dev/null +++ b/.github/workflows/dependabot-auto-merge.yml @@ -0,0 +1,24 @@ +name: Dependabot auto-merge +on: pull_request + +permissions: + contents: write + pull-requests: write + +jobs: + auto-merge: + runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' + steps: + - name: Fetch Dependabot metadata + id: metadata + uses: dependabot/fetch-metadata@v2 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + + - name: Auto-merge minor and patch updates + if: steps.metadata.outputs.update-type != 'version-update:semver-major' + run: gh pr merge --auto --squash "$PR_URL" + env: + PR_URL: ${{ github.event.pull_request.html_url }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 37ea877c836fbbdc00346bab23a9296ecdb8dea6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2026 09:21:34 +0000 Subject: [PATCH 03/11] Bump actions/checkout from 4 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2205f6cd..02e295c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: DATABASE_URL: postgres://postgres:postgres@localhost:5432/kozuchi_test steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up Ruby uses: ruby/setup-ruby@v1 From 452ab037d6631d65576d746667e6b047692008ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2026 09:21:37 +0000 Subject: [PATCH 04/11] Bump actions/setup-node from 4 to 6 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4 to 6. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4...v6) --- updated-dependencies: - dependency-name: actions/setup-node dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2205f6cd..03b4298b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: bundler-cache: true - name: Set up Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: '18' cache: 'yarn' From e73fa6b6bd5700b88a8f3161bce5b09e61bc3c5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2026 09:22:41 +0000 Subject: [PATCH 05/11] Bump puma from 6.6.1 to 7.2.0 Bumps [puma](https://github.com/puma/puma) from 6.6.1 to 7.2.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/main/History.md) - [Commits](https://github.com/puma/puma/compare/v6.6.1...v7.2.0) --- updated-dependencies: - dependency-name: puma dependency-version: 7.2.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e298ddbb..05164086 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -228,7 +228,7 @@ GEM date stringio public_suffix (6.0.2) - puma (6.6.1) + puma (7.2.0) nio4r (~> 2.0) racc (1.8.1) rack (3.2.5) From d8f13e2f62b51edb6a55838c91bd996adfc056f6 Mon Sep 17 00:00:00 2001 From: "Yasuko Ohba (nay3)" Date: Sun, 22 Mar 2026 21:31:07 +0900 Subject: [PATCH 06/11] =?UTF-8?q?Ruby=203.3.8=20=E2=86=92=203.3.10=20?= =?UTF-8?q?=E3=81=AB=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 +- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2205f6cd..668df7d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3.8' + ruby-version: '3.3.10' bundler-cache: true - name: Set up Node.js diff --git a/.ruby-version b/.ruby-version index 37d02a6e..5f6fc5ed 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.8 +3.3.10 diff --git a/Gemfile b/Gemfile index a8717cb9..7944bc47 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'http://rubygems.org' -ruby '3.3.8' +ruby '3.3.10' gem 'activerecord-session_store' gem 'bootstrap-sass' diff --git a/Gemfile.lock b/Gemfile.lock index e298ddbb..c94fcfdd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -378,7 +378,7 @@ DEPENDENCIES timecop RUBY VERSION - ruby 3.3.8p144 + ruby 3.3.10p183 BUNDLED WITH 2.6.9 From 4eda79193ec0a919431482a54f5809985cc44894 Mon Sep 17 00:00:00 2001 From: "Yasuko Ohba (nay3)" Date: Sun, 22 Mar 2026 21:48:30 +0900 Subject: [PATCH 07/11] =?UTF-8?q?dependabot=20=E3=81=AE=E3=83=A1=E3=82=B8?= =?UTF-8?q?=E3=83=A3=E3=83=BC=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=20PR=20=E3=82=92=E6=8A=91=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3d7dd726..2a8bdc84 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,9 @@ updates: directory: "/" schedule: interval: monthly + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major"] groups: minor-and-patch: patterns: ["*"] @@ -13,6 +16,9 @@ updates: directory: "/" schedule: interval: monthly + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major"] groups: minor-and-patch: patterns: ["*"] From d10c3ed2e88729ab6e41aff5339a80357d9c5697 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2026 09:23:25 +0000 Subject: [PATCH 08/11] Bump haml-rails from 2.1.0 to 3.0.0 Bumps [haml-rails](https://github.com/haml/haml-rails) from 2.1.0 to 3.0.0. - [Commits](https://github.com/haml/haml-rails/compare/v2.1.0...v3.0.0) --- updated-dependencies: - dependency-name: haml-rails dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 119dd880..686fb849 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,7 @@ GEM logger (~> 1.5) coderay (1.1.3) concurrent-ruby (1.3.6) - connection_pool (2.5.5) + connection_pool (3.0.2) crass (1.0.6) cuprite (0.17) capybara (~> 3.0) @@ -128,8 +128,7 @@ GEM date (3.5.1) diff-lcs (1.6.2) drb (2.2.3) - erb (4.0.4) - cgi (>= 0.3.3) + erb (6.0.2) erubi (1.13.1) execjs (2.10.0) factory_bot (6.5.6) @@ -146,11 +145,11 @@ GEM ffi (1.17.3) globalid (1.3.0) activesupport (>= 6.1) - haml (6.0.8) + haml (7.2.0) temple (>= 0.8.2) thor tilt - haml-rails (2.1.0) + haml-rails (3.0.0) actionpack (>= 5.1) activesupport (>= 5.1) haml (>= 4.0.6) @@ -193,7 +192,9 @@ GEM method_source (1.1.0) mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (5.27.0) + minitest (6.0.2) + drb (~> 2.0) + prism (~> 1.5) mutex_m (0.3.0) net-imap (0.5.13) date @@ -205,7 +206,7 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.5) - nokogiri (1.18.10) + nokogiri (1.19.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) passenger (6.1.2) @@ -329,9 +330,9 @@ GEM activesupport (>= 6.1) sprockets (>= 3.0.0) stringio (3.2.0) - temple (0.9.1) + temple (0.10.4) thor (1.5.0) - tilt (2.0.11) + tilt (2.7.0) timecop (0.9.10) timeout (0.6.1) tsort (0.2.0) @@ -344,7 +345,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.18) + zeitwerk (2.7.5) PLATFORMS ruby From 53a59fe6223dcba03fa0379ebc89d5f47b7a8fc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2026 13:03:30 +0000 Subject: [PATCH 09/11] Bump rails from 7.1.6 to 7.2.3 in the minor-and-patch group (#343) Bumps the minor-and-patch group with 1 update: [rails](https://github.com/rails/rails). Updates `rails` from 7.1.6 to 7.2.3 - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v7.1.6...v7.2.3) --- updated-dependencies: - dependency-name: rails dependency-version: 7.2.3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile | 2 +- Gemfile.lock | 144 +++++++++++++++++++++++++-------------------------- 2 files changed, 71 insertions(+), 75 deletions(-) diff --git a/Gemfile b/Gemfile index 7944bc47..43da317d 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'passenger' gem 'pg' gem 'sassc-rails' gem 'concurrent-ruby' -gem 'rails', '~> 7.1.0' +gem 'rails', '~> 7.2.3' gem 'rails-controller-testing' gem 'rails-observers' gem 'rake' diff --git a/Gemfile.lock b/Gemfile.lock index 119dd880..4874d1e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,65 +1,60 @@ GEM remote: http://rubygems.org/ specs: - actioncable (7.1.6) - actionpack (= 7.1.6) - activesupport (= 7.1.6) + actioncable (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.6) - actionpack (= 7.1.6) - activejob (= 7.1.6) - activerecord (= 7.1.6) - activestorage (= 7.1.6) - activesupport (= 7.1.6) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.1.6) - actionpack (= 7.1.6) - actionview (= 7.1.6) - activejob (= 7.1.6) - activesupport (= 7.1.6) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp + actionmailbox (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) + actionmailer (7.2.3) + actionpack (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.1.6) - actionview (= 7.1.6) - activesupport (= 7.1.6) + actionpack (7.2.3) + actionview (= 7.2.3) + activesupport (= 7.2.3) cgi nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.3) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.6) - actionpack (= 7.1.6) - activerecord (= 7.1.6) - activestorage (= 7.1.6) - activesupport (= 7.1.6) + useragent (~> 0.16) + actiontext (7.2.3) + actionpack (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.6) - activesupport (= 7.1.6) + actionview (7.2.3) + activesupport (= 7.2.3) builder (~> 3.1) cgi erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.6) - activesupport (= 7.1.6) + activejob (7.2.3) + activesupport (= 7.2.3) globalid (>= 0.3.6) - activemodel (7.1.6) - activesupport (= 7.1.6) - activerecord (7.1.6) - activemodel (= 7.1.6) - activesupport (= 7.1.6) + activemodel (7.2.3) + activesupport (= 7.2.3) + activerecord (7.2.3) + activemodel (= 7.2.3) + activesupport (= 7.2.3) timeout (>= 0.4.0) activerecord-session_store (2.2.0) actionpack (>= 7.0) @@ -67,25 +62,24 @@ GEM cgi (>= 0.3.6) rack (>= 2.0.8, < 4) railties (>= 7.0) - activestorage (7.1.6) - actionpack (= 7.1.6) - activejob (= 7.1.6) - activerecord (= 7.1.6) - activesupport (= 7.1.6) + activestorage (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activesupport (= 7.2.3) marcel (~> 1.0) - activesupport (7.1.6) + activesupport (7.2.3) base64 benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) logger (>= 1.4.2) minitest (>= 5.1) - mutex_m securerandom (>= 0.3) - tzinfo (~> 2.0) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.9) public_suffix (>= 2.0.2, < 8.0) autoprefixer-rails (10.4.7.0) @@ -114,7 +108,7 @@ GEM logger (~> 1.5) coderay (1.1.3) concurrent-ruby (1.3.6) - connection_pool (2.5.5) + connection_pool (3.0.2) crass (1.0.6) cuprite (0.17) capybara (~> 3.0) @@ -128,8 +122,7 @@ GEM date (3.5.1) diff-lcs (1.6.2) drb (2.2.3) - erb (4.0.4) - cgi (>= 0.3.3) + erb (6.0.2) erubi (1.13.1) execjs (2.10.0) factory_bot (6.5.6) @@ -193,9 +186,11 @@ GEM method_source (1.1.0) mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (5.27.0) + minitest (6.0.2) + drb (~> 2.0) + prism (~> 1.5) mutex_m (0.3.0) - net-imap (0.5.13) + net-imap (0.6.3) date net-protocol net-pop (0.1.2) @@ -205,7 +200,7 @@ GEM net-smtp (0.5.1) net-protocol nio4r (2.7.5) - nokogiri (1.18.10) + nokogiri (1.19.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) passenger (6.1.2) @@ -239,20 +234,20 @@ GEM rack (>= 1.3) rackup (2.3.1) rack (>= 3) - rails (7.1.6) - actioncable (= 7.1.6) - actionmailbox (= 7.1.6) - actionmailer (= 7.1.6) - actionpack (= 7.1.6) - actiontext (= 7.1.6) - actionview (= 7.1.6) - activejob (= 7.1.6) - activemodel (= 7.1.6) - activerecord (= 7.1.6) - activestorage (= 7.1.6) - activesupport (= 7.1.6) + rails (7.2.3) + actioncable (= 7.2.3) + actionmailbox (= 7.2.3) + actionmailer (= 7.2.3) + actionpack (= 7.2.3) + actiontext (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activemodel (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) bundler (>= 1.15.0) - railties (= 7.1.6) + railties (= 7.2.3) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -270,11 +265,11 @@ GEM actionview (> 3.1) activesupport (> 3.1) railties (> 3.1) - railties (7.1.6) - actionpack (= 7.1.6) - activesupport (= 7.1.6) + railties (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) cgi - irb + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) @@ -337,6 +332,7 @@ GEM tsort (0.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) + useragent (0.16.11) webrick (1.9.2) websocket-driver (0.8.0) base64 @@ -344,7 +340,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.18) + zeitwerk (2.7.5) PLATFORMS ruby @@ -367,7 +363,7 @@ DEPENDENCIES pg pry-rails puma - rails (~> 7.1.0) + rails (~> 7.2.3) rails-controller-testing rails-observers rails_autolink From 8f295bdbe0ec6bfdc2dde5aa2f00ee298cf73047 Mon Sep 17 00:00:00 2001 From: "Yasuko Ohba (nay3)" Date: Sun, 22 Mar 2026 22:14:57 +0900 Subject: [PATCH 10/11] =?UTF-8?q?haml=207=20=E4=BA=92=E6=8F=9B=E6=80=A7?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C=EF=BC=88=3D=20=E5=BE=8C=E3=81=AE=E3=82=B9?= =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B9=E8=BF=BD=E5=8A=A0=E3=80=81preserve?= =?UTF-8?q?=20=E3=83=98=E3=83=AB=E3=83=91=E3=83=BC=E7=BD=AE=E6=8F=9B?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/help/functions.html.haml | 127 ++++++++++++++--------------- app/views/shared/_navbar.html.haml | 2 +- 2 files changed, 64 insertions(+), 65 deletions(-) diff --git a/app/views/help/functions.html.haml b/app/views/help/functions.html.haml index 9ac6c03d..00494d02 100644 --- a/app/views/help/functions.html.haml +++ b/app/views/help/functions.html.haml @@ -101,70 +101,69 @@ %p 口座、費目、収入内訳、家計簿記入データ、精算データをXMLまたはCSVで出力します。フレンド、取引連携状態等はエクスポートされません。 %p XMLのフォーマットは次のようになります。 %pre{style: "border:1px solid #888888; padding: 4px; margin-left: 20px;"} - = preserve do - :escaped - - - - - - 現金 - ... - ... - - - - - - 食費 - ... - ... - - - - - - 食費 - ... - ... - - - - - - - - - - - -800 - 800 - - - - ... - ... - - - 1300 - - ... - ... - - - - - - - - カードXの精算 - 精算データの備考です - - ... - ... - - - + :preserve + <kozuchi version="0.16.7" timestamp="2009-05-21T14:27:07" user="yourname"> + + <!-- 口座リスト --> + <assets> + <!-- typeに口座種別、positionに並び順、idにシステム上の識別子、要素に口座名が入ります --> + <asset type="cache" position="1" id="account1">現金</asset> + ... + ... + </assets> + + <!-- 費目リスト --> + <expenses> + <!-- positionに並び順、idにシステム上の識別子、要素に費目名が入ります --> + <expense position="1" id="account2">食費</expense> + ... + ... + </expenses> + + <!-- 収入内訳リスト --> + <incomes> + <!-- positionに並び順、idにシステム上の識別子、要素に収入内訳名が入ります --> + <income position="1" id="account2">食費</income> + ... + ... + </incomes> + + <!-- 記入データリスト --> + <deals> + + <!-- １件の記入 --> + <!-- dateに日付、confirmedに確認状態かどうか、positionに１日の中での記入順、idにシステム上の識別子が入ります --> + <deal date="2009-05-15" confirmed="true" position="1" id="deal1"> + <!-- 識別子'account1'の勘定（口座または費目または収入内訳）から識別子'account2'の勘定への800円の移動 --> + <entries> + <entry account="account1" summary="昼食">-800</entry> + <entry account="account2" summary="昼食">800</entry> + <!-- 精算と紐付いていれば entryのsettlement属性に精算の識別子が入ります --> + </entries> + </deal> + ... + ... + <!-- 残高記入 （通常の記入と混在）--> + <balance account="account23" date="2009-05-21" position="2" id="balance745"> + <amount>1300</amount> + </balance> + ... + ... + </deals> + + <!-- 精算リスト --> + <settlements> + <!-- １件の精算 --> + <!-- accountに対象勘定識別子、idにこの精算のシステム内識別子 --> + <settlement account="account24" id="settlement1"> + <name>カードXの精算</name> + <description>精算データの備考です</description> + </settlement> + ... + ... + </settlements> + + </kozuchi> %p CSVのフォーマットはファイル先頭から順に次のようになります。 %table.csv_format %tr diff --git a/app/views/shared/_navbar.html.haml b/app/views/shared/_navbar.html.haml index 5684a083..ef0918c5 100644 --- a/app/views/shared/_navbar.html.haml +++ b/app/views/shared/_navbar.html.haml @@ -13,7 +13,7 @@ %li{class: active_class_if(controller_name == 'home')}= link_to 'ホーム', home_path %li{class: active_class_if(controller_name == 'deals')}= link_to '家計簿', deals_path %li.dropdown{class: active_class_if(%w|profit_and_loss assets balance_sheet|.include?(controller_name) && !controller_path.include?('settings'))} - =link_to "分析".html_safe, '#', class: 'dropdown-toggle', data: {toggle: "dropdown"} + = link_to "分析".html_safe, '#', class: 'dropdown-toggle', data: {toggle: "dropdown"} %ul.dropdown-menu %li= link_to '収支表', profit_and_loss_path %li= link_to '資産表', assets_path From 3e10955f37c40e0729a4633d634d079a78334da3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2026 00:07:16 +0000 Subject: [PATCH 11/11] Bump activestorage from 7.2.3 to 7.2.3.1 (#348) Bumps [activestorage](https://github.com/rails/rails) from 7.2.3 to 7.2.3.1. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v8.1.2.1/activestorage/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v7.2.3...v7.2.3.1) --- updated-dependencies: - dependency-name: activestorage dependency-version: 7.2.3.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 112 +++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 57 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3ba63b17..3831c835 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,29 +1,29 @@ GEM remote: http://rubygems.org/ specs: - actioncable (7.2.3) - actionpack (= 7.2.3) - activesupport (= 7.2.3) + actioncable (7.2.3.1) + actionpack (= 7.2.3.1) + activesupport (= 7.2.3.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.2.3) - actionpack (= 7.2.3) - activejob (= 7.2.3) - activerecord (= 7.2.3) - activestorage (= 7.2.3) - activesupport (= 7.2.3) + actionmailbox (7.2.3.1) + actionpack (= 7.2.3.1) + activejob (= 7.2.3.1) + activerecord (= 7.2.3.1) + activestorage (= 7.2.3.1) + activesupport (= 7.2.3.1) mail (>= 2.8.0) - actionmailer (7.2.3) - actionpack (= 7.2.3) - actionview (= 7.2.3) - activejob (= 7.2.3) - activesupport (= 7.2.3) + actionmailer (7.2.3.1) + actionpack (= 7.2.3.1) + actionview (= 7.2.3.1) + activejob (= 7.2.3.1) + activesupport (= 7.2.3.1) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.2.3) - actionview (= 7.2.3) - activesupport (= 7.2.3) + actionpack (7.2.3.1) + actionview (= 7.2.3.1) + activesupport (= 7.2.3.1) cgi nokogiri (>= 1.8.5) racc @@ -33,28 +33,28 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (7.2.3) - actionpack (= 7.2.3) - activerecord (= 7.2.3) - activestorage (= 7.2.3) - activesupport (= 7.2.3) + actiontext (7.2.3.1) + actionpack (= 7.2.3.1) + activerecord (= 7.2.3.1) + activestorage (= 7.2.3.1) + activesupport (= 7.2.3.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.2.3) - activesupport (= 7.2.3) + actionview (7.2.3.1) + activesupport (= 7.2.3.1) builder (~> 3.1) cgi erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.2.3) - activesupport (= 7.2.3) + activejob (7.2.3.1) + activesupport (= 7.2.3.1) globalid (>= 0.3.6) - activemodel (7.2.3) - activesupport (= 7.2.3) - activerecord (7.2.3) - activemodel (= 7.2.3) - activesupport (= 7.2.3) + activemodel (7.2.3.1) + activesupport (= 7.2.3.1) + activerecord (7.2.3.1) + activemodel (= 7.2.3.1) + activesupport (= 7.2.3.1) timeout (>= 0.4.0) activerecord-session_store (2.2.0) actionpack (>= 7.0) @@ -62,13 +62,13 @@ GEM cgi (>= 0.3.6) rack (>= 2.0.8, < 4) railties (>= 7.0) - activestorage (7.2.3) - actionpack (= 7.2.3) - activejob (= 7.2.3) - activerecord (= 7.2.3) - activesupport (= 7.2.3) + activestorage (7.2.3.1) + actionpack (= 7.2.3.1) + activejob (= 7.2.3.1) + activerecord (= 7.2.3.1) + activesupport (= 7.2.3.1) marcel (~> 1.0) - activesupport (7.2.3) + activesupport (7.2.3.1) base64 benchmark (>= 0.3) bigdecimal @@ -77,7 +77,7 @@ GEM drb i18n (>= 1.6, < 2) logger (>= 1.4.2) - minitest (>= 5.1) + minitest (>= 5.1, < 6) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.9) @@ -186,9 +186,7 @@ GEM method_source (1.1.0) mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (6.0.2) - drb (~> 2.0) - prism (~> 1.5) + minitest (5.27.0) mutex_m (0.3.0) net-imap (0.6.3) date @@ -234,20 +232,20 @@ GEM rack (>= 1.3) rackup (2.3.1) rack (>= 3) - rails (7.2.3) - actioncable (= 7.2.3) - actionmailbox (= 7.2.3) - actionmailer (= 7.2.3) - actionpack (= 7.2.3) - actiontext (= 7.2.3) - actionview (= 7.2.3) - activejob (= 7.2.3) - activemodel (= 7.2.3) - activerecord (= 7.2.3) - activestorage (= 7.2.3) - activesupport (= 7.2.3) + rails (7.2.3.1) + actioncable (= 7.2.3.1) + actionmailbox (= 7.2.3.1) + actionmailer (= 7.2.3.1) + actionpack (= 7.2.3.1) + actiontext (= 7.2.3.1) + actionview (= 7.2.3.1) + activejob (= 7.2.3.1) + activemodel (= 7.2.3.1) + activerecord (= 7.2.3.1) + activestorage (= 7.2.3.1) + activesupport (= 7.2.3.1) bundler (>= 1.15.0) - railties (= 7.2.3) + railties (= 7.2.3.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -265,9 +263,9 @@ GEM actionview (> 3.1) activesupport (> 3.1) railties (> 3.1) - railties (7.2.3) - actionpack (= 7.2.3) - activesupport (= 7.2.3) + railties (7.2.3.1) + actionpack (= 7.2.3.1) + activesupport (= 7.2.3.1) cgi irb (~> 1.13) rackup (>= 1.0.0)