Merge pull request #4129 from fjordllc/main

Release 2022-02-18 02:36:10
fjordllc · Feb 18, 2022 · 35f4d31 · 35f4d31
2 parents 84b58ff + 5ee6f35
commit 35f4d31
Show file tree

Hide file tree

Showing 297 changed files with 6,252 additions and 2,424 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,7 +1,7 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/v0.205.1/containers/ruby/.devcontainer/base.Dockerfile
 
 # [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.0, 2, 2.7, 2.6, 3-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 2.6-bullseye, 3-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster
-ARG VARIANT=2.7-bullseye
+ARG VARIANT=3.1-bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT}
 
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,7 +15,6 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.4
         bundler-cache: true
 
     - name: Set up Node.js

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -44,7 +44,6 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.4
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
     - name: Set up Node.js

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.4
+3.1.0
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
-FROM ruby:2.7.4-alpine
+FROM ruby:3.1.0-alpine
 
 ENV RAILS_ENV production
 WORKDIR /app
 
 # Update rubygems
 RUN gem update --system
 RUN printf "install: --no-rdoc --no-ri\nupdate:  --no-rdoc --no-ri" > ~/.gemrc
-RUN gem install --no-document --force bundler -v 2.2.24
+RUN gem install --no-document --force bundler -v 2.3.6
 RUN bundle config set without development:test
 
 # Install packages

diff --git a/Gemfile b/Gemfile
@@ -3,13 +3,12 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.4'
+ruby '3.1.0'
 
 gem 'bootsnap', '>= 1.4.4', require: false
-gem 'date', '>= 3.2.1' # CVE-2021-41817対応
 gem 'image_processing', '~> 1.2'
 gem 'jbuilder', '~> 2.7'
-gem 'puma', '~> 5.5'
+gem 'puma', '~> 5.6'
 gem 'rails', '~> 6.1.4.4'
 gem 'sass-rails', '>= 6'
 gem 'webpacker', '~> 5.0'
@@ -19,10 +18,10 @@ gem 'active_decorator'
 gem 'active_flag'
 gem 'active_storage_validations'
 gem 'acts_as_list'
-gem 'acts-as-taggable-on', '~> 7.0'
+gem 'acts-as-taggable-on'
+gem 'addressable'
 gem 'any_login'
 gem 'cocoon'
-gem 'coffee-rails', '~> 5.0.0'
 gem 'commonmarker'
 gem 'data_migrate'
 gem 'diffy'
@@ -34,6 +33,9 @@ gem 'jquery-rails'
 gem 'kaminari'
 gem 'mentionable', '~> 0.2.1'
 gem 'meta-tags'
+gem 'net-imap', require: false
+gem 'net-pop', require: false
+gem 'net-smtp', require: false # TODO: Remove it if you use rails 7.0.1
 gem 'oauth2'
 gem 'omniauth', '~> 1.9.1'
 gem 'omniauth-github', '~> 1.4.0'
@@ -51,7 +53,6 @@ gem 'sorcery', '~> 0.16.2'
 gem 'sorcery-jwt'
 gem 'stripe'
 gem 'stripe-i18n', git: 'https://github.com/komagata/stripe-i18n', branch: 'update-depencency'
-gem 'sucker_punch', '~> 2.0'
 
 group :development, :test do
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
@@ -63,7 +64,7 @@ group :development, :test do
 end
 
 group :development do
-  gem 'listen', '~> 3.3'
+  gem 'listen'
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
   gem 'web-console', '>= 4.1.0'
@@ -72,6 +73,7 @@ group :development do
   gem 'bullet'
   gem 'bundle_outdated_formatter'
   gem 'letter_opener_web', '~> 1.0'
+  gem 'rack-dev-mark'
   gem 'rack-mini-profiler', '~> 2.0'
   gem 'rubocop', require: false
   gem 'rubocop-fjord', '~> 0.2.0', require: false
@@ -86,7 +88,7 @@ group :test do
   gem 'capybara', '>= 2.15'
   gem 'minitest-retry'
   gem 'selenium-webdriver'
-  gem 'vcr'
+  gem 'vcr', github: 'vcr/vcr'
   gem 'webdrivers'
   gem 'webmock'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,6 +7,12 @@ GIT
       i18n (>= 0.6, < 2.0)
       railties (>= 4.0)
 
+GIT
+  remote: https://github.com/vcr/vcr.git
+  revision: 8ced6c96e01737a418cd270e0382a8c2c6d85f7f
+  specs:
+    vcr (6.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -78,8 +84,8 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    acts-as-taggable-on (7.0.0)
-      activerecord (>= 5.0, < 6.2)
+    acts-as-taggable-on (9.0.1)
+      activerecord (>= 6.0, < 7.1)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
     addressable (2.8.0)
@@ -89,7 +95,7 @@ GEM
     ast (2.4.2)
     bcrypt (3.1.16)
     bindex (0.8.1)
-    bootsnap (1.10.2)
+    bootsnap (1.10.3)
       msgpack (~> 1.2)
     builder (3.2.4)
     bullet (7.0.1)
@@ -113,13 +119,6 @@ GEM
     childprocess (4.1.0)
     cocoon (1.2.15)
     coderay (1.1.3)
-    coffee-rails (5.0.0)
-      coffee-script (>= 2.2.0)
-      railties (>= 5.2.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     commonmarker (0.23.2)
     concurrent-ruby (1.1.9)
     crack (0.4.5)
@@ -128,15 +127,14 @@ GEM
     data_migrate (7.0.2)
       activerecord (>= 5.0)
       railties (>= 5.0)
-    date (3.2.2)
     dead_end (3.1.1)
     declarative (0.0.20)
     diffy (3.4.0)
+    digest (3.1.0)
     digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
     discord-notifier (1.0.3)
     erubi (1.10.0)
-    execjs (2.8.1)
     faraday (1.9.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -201,11 +199,12 @@ GEM
     hashie (5.0.0)
     holiday_jp (0.8.1)
     httpclient (2.8.3)
-    i18n (1.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
+    io-wait (0.2.1)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
@@ -263,6 +262,21 @@ GEM
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.2)
+      io-wait
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
     nio4r (2.5.8)
     nokogiri (1.13.1)
       mini_portile2 (~> 2.7.0)
@@ -291,7 +305,7 @@ GEM
       ast (~> 2.4.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pg (1.3.0)
+    pg (1.3.1)
     postmark (1.22.0)
       json
     postmark-rails (0.22.0)
@@ -306,12 +320,14 @@ GEM
     psych (4.0.3)
       stringio
     public_suffix (4.0.6)
-    puma (5.6.1)
+    puma (5.6.2)
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
+    rack-dev-mark (0.7.9)
+      rack (>= 1.1, < 2.3)
     rack-mini-profiler (2.3.3)
       rack (>= 1.2.0)
     rack-proxy (0.7.2)
@@ -358,7 +374,7 @@ GEM
       activerecord (>= 5.2.4)
       activesupport (>= 5.2.4)
       i18n
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (2.2.0)
@@ -369,7 +385,7 @@ GEM
     retriable (3.1.2)
     rexml (3.2.5)
     rollbar (3.3.0)
-    rubocop (1.25.0)
+    rubocop (1.25.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -452,11 +468,11 @@ GEM
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
     stripe (5.43.0)
-    sucker_punch (2.1.2)
-      concurrent-ruby (~> 1.0)
+    strscan (3.0.1)
     temple (0.8.2)
     thor (1.2.1)
     tilt (2.0.10)
+    timeout (0.2.0)
     traceroute (0.8.1)
       rails (>= 3.0.0)
     trailblazer-option (0.1.2)
@@ -472,7 +488,6 @@ GEM
     unicode-display_width (2.1.0)
     unicode_utils (1.4.0)
     uniform_notifier (1.14.2)
-    vcr (6.0.0)
     view_source_map (0.3.0)
       rails (>= 5)
     web-console (4.2.0)
@@ -510,19 +525,18 @@ DEPENDENCIES
   active_decorator
   active_flag
   active_storage_validations
-  acts-as-taggable-on (~> 7.0)
+  acts-as-taggable-on
   acts_as_list
+  addressable
   any_login
   bootsnap (>= 1.4.4)
   bullet
   bundle_outdated_formatter
   byebug
   capybara (>= 2.15)
   cocoon
-  coffee-rails (~> 5.0.0)
   commonmarker
   data_migrate
-  date (>= 3.2.1)
   dead_end
   diffy
   discord-notifier
@@ -534,18 +548,22 @@ DEPENDENCIES
   jquery-rails
   kaminari
   letter_opener_web (~> 1.0)
-  listen (~> 3.3)
+  listen
   mentionable (~> 0.2.1)
   meta-tags
   minitest-retry
+  net-imap
+  net-pop
+  net-smtp
   oauth2
   omniauth (~> 1.9.1)
   omniauth-github (~> 1.4.0)
   pg
   postmark-rails
   pry-byebug
-  puma (~> 5.5)
+  puma (~> 5.6)
   rack-cors
+  rack-dev-mark
   rack-mini-profiler (~> 2.0)
   rack-user_agent
   rails (~> 6.1.4.4)
@@ -569,17 +587,16 @@ DEPENDENCIES
   spring-watcher-listen (~> 2.0.0)
   stripe
   stripe-i18n!
-  sucker_punch (~> 2.0)
   traceroute
-  vcr
+  vcr!
   view_source_map
   web-console (>= 4.1.0)
   webdrivers
   webmock
   webpacker (~> 5.0)
 
 RUBY VERSION
-   ruby 2.7.4p191
+   ruby 3.1.0p0
 
 BUNDLED WITH
-   2.2.30
+   2.3.6