From 4b413266ca393a8516aa812dc71e6b02fb849421 Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 10:43:49 +0900 Subject: [PATCH 01/14] PostgreSQL 14.2 -> 16.2 --- .github/workflows/build.yml | 2 +- docker-compose.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2188ddb52..4dc76d545 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: services: postgresql: - image: postgres:14.2 + image: postgres:16.2 ports: - 35432:5432 env: diff --git a/docker-compose.yml b/docker-compose.yml index 13d4b5649..9b65d73bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,11 +20,11 @@ services: - app_gems_data:/usr/local/bundle postgresql: - image: postgres:14.2 + image: postgres:16.2 ports: - "35432:5432" volumes: - - postgresql14_data:/var/lib/postgresql/data:delegated + - postgresql16_data:/var/lib/postgresql/data:delegated environment: POSTGRES_HOST_AUTH_METHOD: trust @@ -43,4 +43,4 @@ services: volumes: app_gems_data: - postgresql14_data: + postgresql16_data: From 5cc449bb4e50402dedcad1ef801ff55eb8d0ca71 Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 10:51:04 +0900 Subject: [PATCH 02/14] =?UTF-8?q?Rails=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- Gemfile.lock | 159 ++++++++++++++++++++++++++------------------------- 2 files changed, 81 insertions(+), 80 deletions(-) diff --git a/Gemfile b/Gemfile index cab265080..1999484dd 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "3.1.2" -gem "rails", "~> 7.0.4.3" +gem "rails", "~> 7.0.8" gem "active_decorator" gem "active_link_to" diff --git a/Gemfile.lock b/Gemfile.lock index 09dfb3ca4..502ffc3a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,47 +8,47 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4.3) - actionpack (= 7.0.4.3) - activesupport (= 7.0.4.3) + actioncable (7.0.8.1) + actionpack (= 7.0.8.1) + activesupport (= 7.0.8.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4.3) - actionpack (= 7.0.4.3) - activejob (= 7.0.4.3) - activerecord (= 7.0.4.3) - activestorage (= 7.0.4.3) - activesupport (= 7.0.4.3) + actionmailbox (7.0.8.1) + actionpack (= 7.0.8.1) + activejob (= 7.0.8.1) + activerecord (= 7.0.8.1) + activestorage (= 7.0.8.1) + activesupport (= 7.0.8.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4.3) - actionpack (= 7.0.4.3) - actionview (= 7.0.4.3) - activejob (= 7.0.4.3) - activesupport (= 7.0.4.3) + actionmailer (7.0.8.1) + actionpack (= 7.0.8.1) + actionview (= 7.0.8.1) + activejob (= 7.0.8.1) + activesupport (= 7.0.8.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4.3) - actionview (= 7.0.4.3) - activesupport (= 7.0.4.3) - rack (~> 2.0, >= 2.2.0) + actionpack (7.0.8.1) + actionview (= 7.0.8.1) + activesupport (= 7.0.8.1) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4.3) - actionpack (= 7.0.4.3) - activerecord (= 7.0.4.3) - activestorage (= 7.0.4.3) - activesupport (= 7.0.4.3) + actiontext (7.0.8.1) + actionpack (= 7.0.8.1) + activerecord (= 7.0.8.1) + activestorage (= 7.0.8.1) + activesupport (= 7.0.8.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4.3) - activesupport (= 7.0.4.3) + actionview (7.0.8.1) + activesupport (= 7.0.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -59,28 +59,28 @@ GEM actionpack addressable active_record_query_trace (1.8) - activejob (7.0.4.3) - activesupport (= 7.0.4.3) + activejob (7.0.8.1) + activesupport (= 7.0.8.1) globalid (>= 0.3.6) - activemodel (7.0.4.3) - activesupport (= 7.0.4.3) - activerecord (7.0.4.3) - activemodel (= 7.0.4.3) - activesupport (= 7.0.4.3) + activemodel (7.0.8.1) + activesupport (= 7.0.8.1) + activerecord (7.0.8.1) + activemodel (= 7.0.8.1) + activesupport (= 7.0.8.1) activerecord-session_store (2.0.0) actionpack (>= 5.2.4.1) activerecord (>= 5.2.4.1) multi_json (~> 1.11, >= 1.11.2) rack (>= 2.0.8, < 3) railties (>= 5.2.4.1) - activestorage (7.0.4.3) - actionpack (= 7.0.4.3) - activejob (= 7.0.4.3) - activerecord (= 7.0.4.3) - activesupport (= 7.0.4.3) + activestorage (7.0.8.1) + actionpack (= 7.0.8.1) + activejob (= 7.0.8.1) + activerecord (= 7.0.8.1) + activesupport (= 7.0.8.1) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4.3) + activesupport (7.0.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -145,7 +145,7 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) commonmarker (0.23.9) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) connection_pool (2.3.0) content_disposition (1.0.0) counter_culture (3.3.0) @@ -154,7 +154,7 @@ GEM crass (1.0.6) cssbundling-rails (1.1.1) railties (>= 6.0.0) - date (3.3.3) + date (3.3.4) debug_inspector (1.1.0) delayed_job (4.1.10) activesupport (>= 3.0, < 8.0) @@ -242,8 +242,8 @@ GEM get_process_mem (0.2.7) ffi (~> 1.0) github-markup (4.0.1) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) graphql (1.12.14) graphql-batch (0.5.1) graphql (>= 1.10, < 3) @@ -261,7 +261,7 @@ GEM httparty (0.21.0) mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) i18n-tasks (1.0.12) activesupport (>= 4.0.2) @@ -317,7 +317,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.21.3) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -325,31 +325,31 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) memory_profiler (1.0.0) meta-tags (2.18.0) actionpack (>= 3.2.0, < 7.1) method_source (1.0.0) mini_magick (4.11.0) - mini_mime (1.1.2) - mini_portile2 (2.8.2) - minitest (5.18.0) + mini_mime (1.1.5) + mini_portile2 (2.8.5) + minitest (5.22.3) mjml-rails (4.8.0) moji (1.6) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.2.3) - net-imap (0.3.4) + net-imap (0.4.10) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.4.0.1) net-protocol - nio4r (2.7.0) - nokogiri (1.15.2) + nio4r (2.7.1) + nokogiri (1.16.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth2 (1.4.7) @@ -398,8 +398,8 @@ GEM puma (>= 2.7) pundit (2.2.0) activesupport (>= 3.0.0) - racc (1.7.0) - rack (2.2.7) + racc (1.7.3) + rack (2.2.9) rack-attack (6.6.1) rack (>= 1.0, < 3) rack-cors (1.1.1) @@ -410,22 +410,23 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) - rails (7.0.4.3) - actioncable (= 7.0.4.3) - actionmailbox (= 7.0.4.3) - actionmailer (= 7.0.4.3) - actionpack (= 7.0.4.3) - actiontext (= 7.0.4.3) - actionview (= 7.0.4.3) - activejob (= 7.0.4.3) - activemodel (= 7.0.4.3) - activerecord (= 7.0.4.3) - activestorage (= 7.0.4.3) - activesupport (= 7.0.4.3) + rails (7.0.8.1) + actioncable (= 7.0.8.1) + actionmailbox (= 7.0.8.1) + actionmailer (= 7.0.8.1) + actionpack (= 7.0.8.1) + actiontext (= 7.0.8.1) + actionview (= 7.0.8.1) + activejob (= 7.0.8.1) + activemodel (= 7.0.8.1) + activerecord (= 7.0.8.1) + activestorage (= 7.0.8.1) + activesupport (= 7.0.8.1) bundler (>= 1.15.0) - railties (= 7.0.4.3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + railties (= 7.0.8.1) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-html-sanitizer (1.6.0) loofah (~> 2.21) @@ -435,15 +436,15 @@ GEM railties (>= 6.0.0, < 8) rails_autolink (1.1.6) rails (> 3.1) - railties (7.0.4.3) - actionpack (= 7.0.4.3) - activesupport (= 7.0.4.3) + railties (7.0.8.1) + actionpack (= 7.0.8.1) + activesupport (= 7.0.8.1) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.0.6) + rake (13.1.0) ransack (3.2.1) activerecord (>= 6.1.5) activesupport (>= 6.1.5) @@ -553,11 +554,11 @@ GEM temple (0.8.2) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) + thor (1.3.1) thread_safe (0.3.6) tilt (2.0.11) timecop (0.9.5) - timeout (0.3.2) + timeout (0.4.1) traceroute (0.8.1) rails (>= 3.0.0) tzinfo (2.0.6) @@ -578,13 +579,13 @@ GEM warden (1.2.9) rack (>= 2.0.9) webrick (1.7.0) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) wilson_score (0.1.0) yard (0.9.28) webrick (~> 1.7.0) - zeitwerk (2.6.8) + zeitwerk (2.6.13) PLATFORMS ruby @@ -659,7 +660,7 @@ DEPENDENCIES rack-mini-profiler rack-rewrite rack-timeout - rails (~> 7.0.4.3) + rails (~> 7.0.8) rails-html-sanitizer rails-i18n rails_autolink From 595d8803b9aec9ae57e8e7b07f8bbaaa538ae27a Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 10:55:35 +0900 Subject: [PATCH 03/14] =?UTF-8?q?cld=20gem=E3=81=AE=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 502ffc3a4..d36583adb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,7 +139,7 @@ GEM uniform_notifier (~> 1.11) by_star (4.0.0) activesupport (>= 3.2.0) - cld (0.11.0) + cld (0.13.0) ffi coderay (1.1.3) coercible (1.0.0) @@ -238,7 +238,7 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.0.0) faraday (~> 1.0) - ffi (1.15.5) + ffi (1.16.3) get_process_mem (0.2.7) ffi (~> 1.0) github-markup (4.0.1) From 6615eb8e39428dfc045941830007a184efdd2341 Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 10:55:48 +0900 Subject: [PATCH 04/14] =?UTF-8?q?Ruby=E3=82=92=E3=82=A2=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 4 ++-- Dockerfile.dev | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4dc76d545..23203afd0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Ruby and install gems uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1.2 + ruby-version: 3.1.4 bundler-cache: true - name: Run Standard` @@ -59,7 +59,7 @@ jobs: - name: Setup Ruby and install gems uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1.2 + ruby-version: 3.1.4 bundler-cache: true - name: Setup Node diff --git a/Dockerfile.dev b/Dockerfile.dev index a01581b36..9b3e45841 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -ARG RUBY_VERSION="3.1.2" +ARG RUBY_VERSION="3.1.4" ARG BUNDLER_VERSION="2.3.12" ARG NODE_VERSION="16.14.2" ARG YARN_VERSION="1.22.21" diff --git a/Gemfile b/Gemfile index 1999484dd..d01ba82af 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.1.2" +ruby "3.1.4" gem "rails", "~> 7.0.8" diff --git a/Gemfile.lock b/Gemfile.lock index d36583adb..edf7cfa49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -685,7 +685,7 @@ DEPENDENCIES wilson_score RUBY VERSION - ruby 3.1.2p20 + ruby 3.1.4p223 BUNDLED WITH 2.3.12 From d075759ba160ad418bb04424b4fd25f2755d66fa Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 11:01:43 +0900 Subject: [PATCH 05/14] =?UTF-8?q?yard=20gem=E3=82=92=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index edf7cfa49..af8fe9698 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -578,13 +578,11 @@ GEM descendants_tracker (~> 0.0, >= 0.0.3) warden (1.2.9) rack (>= 2.0.9) - webrick (1.7.0) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) wilson_score (0.1.0) - yard (0.9.28) - webrick (~> 1.7.0) + yard (0.9.36) zeitwerk (2.6.13) PLATFORMS From 80af062583c1de6c66b729e99a63593f9e6b18e5 Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 11:02:16 +0900 Subject: [PATCH 06/14] =?UTF-8?q?view=5Fcomponent=20gem=E3=82=92=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index af8fe9698..f0b1b4288 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -568,8 +568,8 @@ GEM unparser (0.6.5) diff-lcs (~> 1.3) parser (>= 3.1.0) - view_component (2.74.1) - activesupport (>= 5.0.0, < 8.0) + view_component (3.11.0) + activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) virtus (2.0.0) From cf1ed2ece57ce7e2f2b6f152c37622143133da3b Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 11:02:46 +0900 Subject: [PATCH 07/14] =?UTF-8?q?commonmarker=20gem=E3=82=92=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f0b1b4288..f6d021fc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,7 +144,8 @@ GEM coderay (1.1.3) coercible (1.0.0) descendants_tracker (~> 0.0.1) - commonmarker (0.23.9) + commonmarker (1.0.4) + rb_sys (~> 0.9) concurrent-ruby (1.2.3) connection_pool (2.3.0) content_disposition (1.0.0) @@ -452,6 +453,7 @@ GEM rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) + rb_sys (0.9.90) redis (5.0.5) redis-client (>= 0.9.0) redis-client (0.9.0) From be50c025daa87f27fa4015339cb0fa3439c014b7 Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 11:03:34 +0900 Subject: [PATCH 08/14] =?UTF-8?q?doorkeeper=20gem=E3=82=92=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f6d021fc9..f51281de1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -173,7 +173,7 @@ GEM diff-lcs (1.5.0) discord-notifier (1.0.3) docile (1.3.5) - doorkeeper (5.6.0) + doorkeeper (5.6.9) railties (>= 5) dotenv (2.8.1) dotenv-rails (2.8.1) From d72d92df3b333aefa007defeedef62b6f41204e1 Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 11:06:48 +0900 Subject: [PATCH 09/14] =?UTF-8?q?standard=20gem=E3=82=92=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 51 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f51281de1..e741db9ea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -286,7 +286,7 @@ GEM jmespath (1.6.2) jsbundling-rails (1.0.3) railties (>= 6.0.0) - json (2.6.2) + json (2.7.1) jwt (2.2.3) kaminari (1.2.2) activesupport (>= 4.1.0) @@ -310,6 +310,8 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) + language_server-protocol (3.17.0.3) + lint_roller (1.1.0) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -374,9 +376,10 @@ GEM actionpack (>= 4.2) omniauth (>= 1.3.1) orm_adapter (0.5.0) - parallel (1.22.1) - parser (3.1.2.1) + parallel (1.24.0) + parser (3.3.0.5) ast (~> 2.4.1) + racc pg (1.4.4) prelude-batch-loader (0.0.5) activerecord (>= 6) @@ -458,7 +461,7 @@ GEM redis-client (>= 0.9.0) redis-client (0.9.0) connection_pool - regexp_parser (2.6.0) + regexp_parser (2.9.0) request_store (1.5.1) rack (>= 1.4) resend (0.9.0) @@ -468,7 +471,7 @@ GEM railties (>= 5.0) reverse_markdown (2.1.1) nokogiri - rexml (3.2.5) + rexml (3.2.6) rspec-core (3.11.0) rspec-support (~> 3.11.0) rspec-expectations (3.11.1) @@ -486,21 +489,22 @@ GEM rspec-mocks (~> 3.11) rspec-support (~> 3.11) rspec-support (3.11.1) - rubocop (1.35.1) + rubocop (1.62.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-performance (1.14.3) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) + rubocop-performance (1.20.2) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-next (0.15.2) ruby-next-core (= 0.15.2) ruby-next-parser (>= 3.1.1.0) @@ -508,7 +512,7 @@ GEM ruby-next-core (0.15.2) ruby-next-parser (3.1.1.3) parser (>= 3.0.3.1) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby-vips (2.1.4) ffi (~> 1.12) ruby2_keywords (0.0.5) @@ -546,9 +550,18 @@ GEM tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) squasher (0.6.2) - standard (1.16.1) - rubocop (= 1.35.1) - rubocop-performance (= 1.14.3) + standard (1.35.1) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.62.0) + standard-custom (~> 1.0.0) + standard-performance (~> 1.3) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.3.1) + lint_roller (~> 1.1) + rubocop-performance (~> 1.20.2) syoboi_calendar (0.9.4) faraday faraday_middleware @@ -565,7 +578,7 @@ GEM rails (>= 3.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.3.0) + unicode-display_width (2.5.0) uniform_notifier (1.16.0) unparser (0.6.5) diff-lcs (~> 1.3) From 24353190565187ddab91570fc6d079bf5276fd85 Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 11:25:27 +0900 Subject: [PATCH 10/14] =?UTF-8?q?Binstub=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/bundle | 3 --- bin/standardrb | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) delete mode 100755 bin/bundle create mode 100755 bin/standardrb diff --git a/bin/bundle b/bin/bundle deleted file mode 100755 index f19acf5b5..000000000 --- a/bin/bundle +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env ruby -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) -load Gem.bin_path('bundler', 'bundle') diff --git a/bin/standardrb b/bin/standardrb new file mode 100755 index 000000000..88ae670b1 --- /dev/null +++ b/bin/standardrb @@ -0,0 +1,27 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'standardrb' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) + +bundle_binstub = File.expand_path("bundle", __dir__) + +if File.file?(bundle_binstub) + if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ + load(bundle_binstub) + else + abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. +Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") + end +end + +require "rubygems" +require "bundler/setup" + +load Gem.bin_path("standard", "standardrb") From 8cccf6f55fd000decf514d5973cf8bc18061b9ae Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 11:25:52 +0900 Subject: [PATCH 11/14] =?UTF-8?q?Binstub=E3=82=92=E4=BD=BF=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23203afd0..ce32af143 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,7 @@ jobs: ruby-version: 3.1.4 bundler-cache: true - - name: Run Standard` - run: | - bundle exec standardrb + - run: bin/standardrb test_rspec: name: Test (RSpec) @@ -91,5 +89,5 @@ jobs: - name: Run tests run: | ./cc-test-reporter before-build - bundle exec rspec + bin/rspec ./cc-test-reporter after-build --coverage-input-type simplecov --exit-code $? From 631572e96ffd8e4143abdcec1facdf8da2d4f591 Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 11:26:06 +0900 Subject: [PATCH 12/14] =?UTF-8?q?`.standard=5Ftodo.yml`=20=E3=82=92?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .standard_todo.yml | 227 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 205 insertions(+), 22 deletions(-) diff --git a/.standard_todo.yml b/.standard_todo.yml index 595aa6ced..efa5d6d4c 100644 --- a/.standard_todo.yml +++ b/.standard_todo.yml @@ -2,25 +2,208 @@ # Remove from this list as you refactor files. --- ignore: - - app/controllers/api/v1/application_controller.rb - - app/decorators/organization_decorator.rb - - app/decorators/person_decorator.rb - - app/decorators/work_decorator.rb - - app/graphql/canary/mutations/update_status.rb - - app/helpers/db/application_helper.rb - - app/models/episode_record.rb - - app/models/work.rb - - app/validators/amazon_validator.rb - - app/validators/redirect_uri_validator.rb - - app/views/api/internal/library_entries/_library_entry.jb - - app/views/api/v1/characters/index.jb - - app/views/api/v1/episodes/index.jb - - app/views/api/v1/people/index.jb - - config/application.rb - - config/puma.rb - - lib/tasks/email_notification.rake - - lib/tasks/episode.rake - - lib/tasks/mal.rake - - lib/tasks/work.rake - - spec/spec_helper.rb - - spec/support/devise.rb +- app/components/deprecated/activities/record_activity_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/activities/status_activity_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/adsense_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/application_v6_component.rb: + - Style/ArgumentsForwarding +- app/components/deprecated/badges/slot_start_date_badge_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/badges/supporter_badge_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/badges/work_media_badge_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/badges/work_season_badge_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/body_v6_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/boxes/work_box_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/button_groups/episode_transition_button_group_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/button_groups/pagination_button_group_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/button_groups/record_rating_button_group_component.rb: + - Style/SuperWithArgsParentheses + - Style/TernaryParentheses +- app/components/deprecated/button_groups/user_button_group_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/button_groups/work_button_group_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/buttons/bulk_watch_episodes_button_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/buttons/follow_button_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/buttons/like_button_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/buttons/mute_user_button_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/buttons/receive_channel_button_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/buttons/share_to_facebook_button_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/buttons/share_to_twitter_button_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/buttons/skip_episode_button_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/buttons/star_button_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/buttons/watch_episode_button_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/cards/work_card_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/collapses/record_form_options_collapse_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/contents/record_content_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/contents/status_content_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/dropdowns/record_options_dropdown_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/dropdowns/status_select_dropdown_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/empty_v6_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/error_panel_v6_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/flash_v6_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/footers/record_footer_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/footers/status_footer_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/forms/episode_record_form_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/forms/work_record_form_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/headers/profile_header_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/headers/record_header_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/headers/work_header_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/inputs/recaptcha_input_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/label_groups/work_record_rating_label_group_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/labels/rating_label_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/list_groups/record_list_group_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/list_groups/record_month_list_group_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/list_items/record_list_item_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/lists/record_list_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/lists/trackable_episode_list_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/navs/user_nav_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/radios/program_select_radio_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/relative_time_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/sidebars/main_sidebar_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/spoiler_guard_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/tab_bar_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/textareas/record_textarea_component.rb: + - Style/SuperWithArgsParentheses +- app/components/deprecated/timeline_component.rb: + - Style/SuperWithArgsParentheses +- app/controllers/api/internal/program_selects_controller.rb: + - Style/TernaryParentheses +- app/controllers/api/v1/application_controller.rb: + - Lint/DuplicateMethods + - Style/RedundantReturn +- app/controllers/callbacks_controller.rb: + - Style/TernaryParentheses +- app/controllers/concerns/localizable.rb: + - Style/TernaryParentheses + - Style/ArgumentsForwarding +- app/controllers/concerns/work_listable.rb: + - Style/TernaryParentheses +- app/decorators/concerns/resource_image_decorator_common.rb: + - Style/TernaryParentheses +- app/decorators/profile_decorator.rb: + - Style/TernaryParentheses +- app/forms/deprecated/db/staff_rows_form.rb: + - Style/RedundantParentheses +- app/graphql/beta/resolvers/library_entries.rb: + - Style/TernaryParentheses +- app/graphql/beta/types/objects/work_type.rb: + - Style/TernaryParentheses +- app/graphql/canary/resolvers/library_entries.rb: + - Style/TernaryParentheses +- app/graphql/canary/types/objects/user_type.rb: + - Style/TernaryParentheses +- app/graphql/canary/types/objects/work_type.rb: + - Style/TernaryParentheses +- app/helpers/application_helper.rb: + - Style/TernaryParentheses +- app/helpers/db/application_helper.rb: + - Performance/Detect +- app/helpers/head_helper.rb: + - Style/TernaryParentheses +- app/helpers/time_zone_helper.rb: + - Style/TernaryParentheses +- app/models/application_record.rb: + - Lint/SymbolConversion +- app/models/concerns/active_parameter.rb: + - Style/SuperWithArgsParentheses + - Performance/StringIdentifierArgument +- app/models/concerns/resource_rows.rb: + - Style/RedundantRegexpArgument +- app/models/episode_record.rb: + - Lint/ReturnInVoidContext +- app/models/forms/work_record_form.rb: + - Performance/StringIdentifierArgument +- app/models/season.rb: + - Style/TernaryParentheses +- app/models/tv_time.rb: + - Style/TernaryParentheses +- app/models/work.rb: + - Layout/SpaceInLambdaLiteral +- app/services/deprecated/email_notification_service.rb: + - Performance/StringIdentifierArgument +- app/validators/amazon_validator.rb: + - Performance/EndWith +- app/validators/redirect_uri_validator.rb: + - Lint/NonLocalExitFromIterator +- app/views/api/v1/application/_pagination.jb: + - Style/TernaryParentheses +- app/views/api/v1/characters/index.jb: + - Style/IfInsideElse +- app/views/api/v1/episodes/index.jb: + - Style/IfInsideElse +- app/views/api/v1/people/index.jb: + - Style/IfInsideElse +- app/views/api/v1/users/_user.jb: + - Lint/SymbolConversion +- config/application.rb: + - Style/GlobalStdStream + - Layout/ArgumentAlignment + - Lint/AmbiguousRegexpLiteral + - Style/StringLiteralsInInterpolation + - Lint/ConstantDefinitionInBlock +- config/initializers/application_controller_renderer.rb: + - Layout/EmptyLineAfterMagicComment +- config/routes.rb: + - Layout/LineLength +- lib/tasks/email_notification.rake: + - Lint/UselessAssignment +- lib/tasks/episode.rake: + - Lint/ConstantDefinitionInBlock +- lib/tasks/mal.rake: + - Lint/ConstantDefinitionInBlock +- lib/tasks/work.rake: + - Lint/SymbolConversion + - Lint/ConstantDefinitionInBlock +- spec/support/devise.rb: + - Style/MixinUsage From 94370f606c8fa0f87399fdaed42791cf881a9597 Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 11:34:10 +0900 Subject: [PATCH 13/14] =?UTF-8?q?=E3=83=AB=E3=83=BC=E3=83=86=E3=82=A3?= =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=81=AE=E5=AE=9A=E7=BE=A9=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Standardに怒られないようにした --- config/routes.rb | 86 ++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index cfca550b1..ec6e0859d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,22 +26,22 @@ skip_controllers :authorized_applications end - # standard:disable Layout/ExtraSpacing - match "/@:username", via: :get, as: :profile, to: "profiles#show", username: ROUTING_USERNAME_FORMAT - match "/@:username/:status_kind", via: :get, as: :library, to: "libraries#show", username: ROUTING_USERNAME_FORMAT, status_kind: /wanna_watch|watching|watched|on_hold|stop_watching/ - match "/@:username/collections", via: :get, as: :user_collection_list, to: "collections#index", username: ROUTING_USERNAME_FORMAT - match "/@:username/collections/:collection_id", via: :get, as: :user_collection, to: "collections#show", username: ROUTING_USERNAME_FORMAT - match "/@:username/favorite_characters", via: :get, as: :favorite_character_list, to: "favorite_characters#index", username: ROUTING_USERNAME_FORMAT - match "/@:username/favorite_organizations", via: :get, as: :favorite_organization_list, to: "favorite_organizations#index", username: ROUTING_USERNAME_FORMAT - match "/@:username/favorite_people", via: :get, as: :favorite_person_list, to: "favorite_people#index", username: ROUTING_USERNAME_FORMAT - match "/@:username/followers", via: :get, as: :follower_list, to: "followers#index", username: ROUTING_USERNAME_FORMAT - match "/@:username/following", via: :get, as: :followee_list, to: "followees#index", username: ROUTING_USERNAME_FORMAT - match "/@:username/ics", via: :get, as: :user_ics, to: "ics#show", username: ROUTING_USERNAME_FORMAT - match "/@:username/records", via: :get, as: :record_list, to: "records#index", username: ROUTING_USERNAME_FORMAT - match "/@:username/records/:record_id", via: :delete, as: :record, to: "records#destroy", username: ROUTING_USERNAME_FORMAT - match "/@:username/records/:record_id", via: :get, to: "records#show", username: ROUTING_USERNAME_FORMAT - match "/api/internal/@:username/records/:record_id", via: :patch, as: :internal_api_record, to: "api/internal/records#update", username: ROUTING_USERNAME_FORMAT - match "/api/internal/works/:work_id/commented_records", via: :post, as: :internal_api_commented_work_record_list, to: "api/internal/commented_work_records#create", work_id: ROUTING_ID_FORMAT + # standard:disable Layout/ExtraSpacing, Layout/LineLength + match "/@:username", via: :get, as: :profile, to: "profiles#show", username: ROUTING_USERNAME_FORMAT + match "/@:username/:status_kind", via: :get, as: :library, to: "libraries#show", username: ROUTING_USERNAME_FORMAT, status_kind: /wanna_watch|watching|watched|on_hold|stop_watching/ + match "/@:username/collections", via: :get, as: :user_collection_list, to: "collections#index", username: ROUTING_USERNAME_FORMAT + match "/@:username/collections/:collection_id", via: :get, as: :user_collection, to: "collections#show", username: ROUTING_USERNAME_FORMAT + match "/@:username/favorite_characters", via: :get, as: :favorite_character_list, to: "favorite_characters#index", username: ROUTING_USERNAME_FORMAT + match "/@:username/favorite_organizations", via: :get, as: :favorite_organization_list, to: "favorite_organizations#index", username: ROUTING_USERNAME_FORMAT + match "/@:username/favorite_people", via: :get, as: :favorite_person_list, to: "favorite_people#index", username: ROUTING_USERNAME_FORMAT + match "/@:username/followers", via: :get, as: :follower_list, to: "followers#index", username: ROUTING_USERNAME_FORMAT + match "/@:username/following", via: :get, as: :followee_list, to: "followees#index", username: ROUTING_USERNAME_FORMAT + match "/@:username/ics", via: :get, as: :user_ics, to: "ics#show", username: ROUTING_USERNAME_FORMAT + match "/@:username/records", via: :get, as: :record_list, to: "records#index", username: ROUTING_USERNAME_FORMAT + match "/@:username/records/:record_id", via: :delete, as: :record, to: "records#destroy", username: ROUTING_USERNAME_FORMAT + match "/@:username/records/:record_id", via: :get, to: "records#show", username: ROUTING_USERNAME_FORMAT + match "/api/internal/@:username/records/:record_id", via: :patch, as: :internal_api_record, to: "api/internal/records#update", username: ROUTING_USERNAME_FORMAT + match "/api/internal/works/:work_id/commented_records", via: :post, as: :internal_api_commented_work_record_list, to: "api/internal/commented_work_records#create", work_id: ROUTING_ID_FORMAT match "/api/internal/works/:work_id/program_select", via: :post, as: :internal_api_work_program_select, to: "api/internal/program_selects#create" match "/api/internal/works/:work_id/status_select", via: :post, as: :internal_api_work_status_select, to: "api/internal/status_selects#create" match "/api/internal/channels/:channel_id/reception", via: :delete, as: :internal_api_channel_reception, to: "api/internal/receptions#destroy" @@ -76,7 +76,7 @@ match "/channels", via: :get, as: :channel_list, to: "channels#index" match "/characters/:character_id", via: :get, as: :character, to: "characters#show" match "/characters/:character_id/fans", via: :get, as: :character_fan_list, to: "character_fans#index" - match "/checkins/redirect/:provider/:url_hash", via: :get, as: :legacy_record_redirect_1, to: "legacy/record_redirects#show", provider: /fb|tw/, url_hash: /[0-9a-zA-Z_-]{10}/ + match "/checkins/redirect/:provider/:url_hash", via: :get, as: :legacy_record_redirect_1, to: "legacy/record_redirects#show", provider: /fb|tw/, url_hash: /[0-9a-zA-Z_-]{10}/ match "/collection_items", via: :posst, as: :collection_item_list, to: "collection_items#create" match "/collection_items/:collection_item_id", via: :delete, as: :collection_item, to: "collection_items#destroy" match "/collection_items/:collection_item_id", via: :patch, to: "collection_items#update" @@ -208,19 +208,19 @@ match "/episode_records", via: :patch, as: :episode_record_mutation, to: "episode_records#update" match "/faq", via: :get, as: :faq, to: "faqs#show" match "/forum", via: :get, as: :forum, to: "forum/home#show" - match "/forum/categories/:category_id", via: :get, as: :forum_category, to: "forum/categories#show", category_id: /[a-z_]+/ + match "/forum/categories/:category_id", via: :get, as: :forum_category, to: "forum/categories#show", category_id: /[a-z_]+/ match "/forum/posts", via: :post, as: :forum_post_list, to: "forum/posts#create" - match "/forum/posts/:post_id", via: :get, as: :forum_post, to: "forum/posts#show", post_id: ROUTING_ID_FORMAT - match "/forum/posts/:post_id", via: :patch, to: "forum/posts#update", post_id: ROUTING_ID_FORMAT - match "/forum/posts/:post_id/comments", via: :post, as: :forum_comment_list, to: "forum/comments#create", post_id: ROUTING_ID_FORMAT - match "/forum/posts/:post_id/comments/:comment_id", via: :patch, as: :forum_comment, to: "forum/comments#update", post_id: ROUTING_ID_FORMAT, comment_id: ROUTING_ID_FORMAT - match "/forum/posts/:post_id/comments/:comment_id/edit", via: :get, as: :forum_edit_comment, to: "forum/comments#edit", post_id: ROUTING_ID_FORMAT, comment_id: ROUTING_ID_FORMAT - match "/forum/posts/:post_id/edit", via: :get, as: :forum_edit_post, to: "forum/posts#edit", post_id: ROUTING_ID_FORMAT + match "/forum/posts/:post_id", via: :get, as: :forum_post, to: "forum/posts#show", post_id: ROUTING_ID_FORMAT + match "/forum/posts/:post_id", via: :patch, to: "forum/posts#update", post_id: ROUTING_ID_FORMAT + match "/forum/posts/:post_id/comments", via: :post, as: :forum_comment_list, to: "forum/comments#create", post_id: ROUTING_ID_FORMAT + match "/forum/posts/:post_id/comments/:comment_id", via: :patch, as: :forum_comment, to: "forum/comments#update", post_id: ROUTING_ID_FORMAT, comment_id: ROUTING_ID_FORMAT + match "/forum/posts/:post_id/comments/:comment_id/edit", via: :get, as: :forum_edit_comment, to: "forum/comments#edit", post_id: ROUTING_ID_FORMAT, comment_id: ROUTING_ID_FORMAT + match "/forum/posts/:post_id/edit", via: :get, as: :forum_edit_post, to: "forum/posts#edit", post_id: ROUTING_ID_FORMAT match "/forum/posts/new", via: :get, as: :forum_new_post, to: "forum/posts#new" - match "/fragment/@:username/records", via: :get, as: :fragment_record_list, to: "fragment/records#index", username: ROUTING_USERNAME_FORMAT - match "/fragment/@:username/records/:record_id", via: :get, as: :fragment_record, to: "fragment/records#show", username: ROUTING_USERNAME_FORMAT - match "/fragment/@:username/records/:record_id/edit", via: :get, as: :fragment_edit_record, to: "fragment/records#edit", username: ROUTING_USERNAME_FORMAT - match "/fragment/@:username/tracking_heatmap", via: :get, as: :fragment_tracking_heatmap, to: "fragment/tracking_heatmaps#show", username: ROUTING_USERNAME_FORMAT + match "/fragment/@:username/records", via: :get, as: :fragment_record_list, to: "fragment/records#index", username: ROUTING_USERNAME_FORMAT + match "/fragment/@:username/records/:record_id", via: :get, as: :fragment_record, to: "fragment/records#show", username: ROUTING_USERNAME_FORMAT + match "/fragment/@:username/records/:record_id/edit", via: :get, as: :fragment_edit_record, to: "fragment/records#edit", username: ROUTING_USERNAME_FORMAT + match "/fragment/@:username/tracking_heatmap", via: :get, as: :fragment_tracking_heatmap, to: "fragment/tracking_heatmaps#show", username: ROUTING_USERNAME_FORMAT match "/fragment/activity_groups/:activity_group_id/items", via: :get, as: :fragment_activity_item_list, to: "fragment/activity_items#index" match "/fragment/episodes/:episode_id/records", via: :get, as: :fragment_episode_record_list, to: "fragment/episode_records#index" match "/fragment/works/:work_id/collection_items", via: :post, as: :fragment_collection_item_list, to: "fragment/collection_items#create" @@ -240,7 +240,7 @@ match "/people/:person_id", via: :get, as: :person, to: "people#show" match "/people/:person_id/fans", via: :get, as: :person_fan_list, to: "person_fans#index" match "/privacy", via: :get, as: :privacy, to: "pages#privacy" - match "/r/:provider/:url_hash", via: :get, as: :legacy_record_redirect_2, to: "legacy/record_redirects#show", provider: /fb|tw/, url_hash: /[0-9a-zA-Z_-]{10}/ + match "/r/:provider/:url_hash", via: :get, as: :legacy_record_redirect_2, to: "legacy/record_redirects#show", provider: /fb|tw/, url_hash: /[0-9a-zA-Z_-]{10}/ match "/registrations/new", via: :get, as: :new_registration, to: "registrations#new" match "/search", via: :get, as: :search, to: "searches#show" match "/settings/account", via: :get, as: :settings_account, to: "settings/accounts#show" @@ -278,22 +278,22 @@ match "/track", via: :get, as: :track, to: "tracks#show" match "/userland", via: :get, as: :userland, to: "userland/home#show" match "/userland/projects", via: :post, as: :userland_project_list, to: "userland/projects#create" - match "/userland/projects/:project_id", via: :delete, as: :userland_project, to: "userland/projects#destroy", project_id: ROUTING_ID_FORMAT - match "/userland/projects/:project_id", via: :get, to: "userland/projects#show", project_id: ROUTING_ID_FORMAT - match "/userland/projects/:project_id", via: :patch, to: "userland/projects#update", project_id: ROUTING_ID_FORMAT - match "/userland/projects/:project_id/edit", via: :get, as: :userland_edit_project, to: "userland/projects#edit", project_id: ROUTING_ID_FORMAT + match "/userland/projects/:project_id", via: :delete, as: :userland_project, to: "userland/projects#destroy", project_id: ROUTING_ID_FORMAT + match "/userland/projects/:project_id", via: :get, to: "userland/projects#show", project_id: ROUTING_ID_FORMAT + match "/userland/projects/:project_id", via: :patch, to: "userland/projects#update", project_id: ROUTING_ID_FORMAT + match "/userland/projects/:project_id/edit", via: :get, as: :userland_edit_project, to: "userland/projects#edit", project_id: ROUTING_ID_FORMAT match "/userland/projects/new", via: :get, as: :userland_new_project, to: "userland/projects#new" match "/work_display_option", via: :get, as: :work_display_option, to: "work_display_options#show" - match "/works/:work_id", via: :get, as: :work, to: "works#show", work_id: ROUTING_ID_FORMAT - match "/works/:work_id/casts", via: :get, as: :cast_list, to: "casts#index", work_id: ROUTING_ID_FORMAT - match "/works/:work_id/episodes", via: :get, as: :episode_list, to: "episodes#index", work_id: ROUTING_ID_FORMAT - match "/works/:work_id/episodes/:episode_id", via: :get, as: :episode, to: "episodes#show", work_id: ROUTING_ID_FORMAT - match "/works/:work_id/info", via: :get, as: :work_info, to: "work_infos#show", work_id: ROUTING_ID_FORMAT - match "/works/:work_id/records", via: :get, as: :work_record_list, to: "work_records#index", work_id: ROUTING_ID_FORMAT - match "/works/:work_id/related_works", via: :get, as: :related_work_list, to: "related_works#index", work_id: ROUTING_ID_FORMAT - match "/works/:work_id/staffs", via: :get, as: :staff_list, to: "staffs#index", work_id: ROUTING_ID_FORMAT - match "/works/:work_id/videos", via: :get, as: :video_list, to: "videos#index", work_id: ROUTING_ID_FORMAT - match "/works/:season_slug", via: :get, as: :seasonal_work_list, to: "seasonal_works#index", season_slug: /[0-9]{4}-(all|spring|summer|autumn|winter)/ + match "/works/:work_id", via: :get, as: :work, to: "works#show", work_id: ROUTING_ID_FORMAT + match "/works/:work_id/casts", via: :get, as: :cast_list, to: "casts#index", work_id: ROUTING_ID_FORMAT + match "/works/:work_id/episodes", via: :get, as: :episode_list, to: "episodes#index", work_id: ROUTING_ID_FORMAT + match "/works/:work_id/episodes/:episode_id", via: :get, as: :episode, to: "episodes#show", work_id: ROUTING_ID_FORMAT + match "/works/:work_id/info", via: :get, as: :work_info, to: "work_infos#show", work_id: ROUTING_ID_FORMAT + match "/works/:work_id/records", via: :get, as: :work_record_list, to: "work_records#index", work_id: ROUTING_ID_FORMAT + match "/works/:work_id/related_works", via: :get, as: :related_work_list, to: "related_works#index", work_id: ROUTING_ID_FORMAT + match "/works/:work_id/staffs", via: :get, as: :staff_list, to: "staffs#index", work_id: ROUTING_ID_FORMAT + match "/works/:work_id/videos", via: :get, as: :video_list, to: "videos#index", work_id: ROUTING_ID_FORMAT + match "/works/:season_slug", via: :get, as: :seasonal_work_list, to: "seasonal_works#index", season_slug: /[0-9]{4}-(all|spring|summer|autumn|winter)/ match "/works/newest", via: :get, as: :newest_work_list, to: "newest_works#index" match "/works/popular", via: :get, as: :popular_work_list, to: "popular_works#index" # standard:enable Layout/ExtraSpacing, Layout/LineLength From 414c19e5d80a3c37ae0b5cd7284e015b3f70282f Mon Sep 17 00:00:00 2001 From: Koji Shimba Date: Sat, 23 Mar 2024 11:45:34 +0900 Subject: [PATCH 14/14] =?UTF-8?q?commonmarker=20gem:=20github-markup=20gem?= =?UTF-8?q?=E3=81=8C1=E7=B3=BB=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=81=BE=E3=81=A70=E7=B3=BB=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 4 +++- Gemfile.lock | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index d01ba82af..d0b03a576 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,9 @@ gem "aws-sdk-s3" # Using in Shrine gem "browser", require: "browser/browser" gem "by_star" gem "cld" -gem "commonmarker" # Using github-markup +# github-markupが1系に対応するまで0系を使う +# ref: https://github.com/github/markup/issues/1758 +gem "commonmarker", "< 1.0" # Using github-markup gem "counter_culture" gem "cssbundling-rails" gem "delayed_job_active_record" diff --git a/Gemfile.lock b/Gemfile.lock index e741db9ea..1a62ee664 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,8 +144,7 @@ GEM coderay (1.1.3) coercible (1.0.0) descendants_tracker (~> 0.0.1) - commonmarker (1.0.4) - rb_sys (~> 0.9) + commonmarker (0.23.10) concurrent-ruby (1.2.3) connection_pool (2.3.0) content_disposition (1.0.0) @@ -456,7 +455,6 @@ GEM rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) - rb_sys (0.9.90) redis (5.0.5) redis-client (>= 0.9.0) redis-client (0.9.0) @@ -619,7 +617,7 @@ DEPENDENCIES bullet by_star cld - commonmarker + commonmarker (< 1.0) counter_culture cssbundling-rails delayed_job_active_record