From 77713ddea552341aa16c503fe466c93803e6700d Mon Sep 17 00:00:00 2001 From: ima1zumi Date: Thu, 21 Oct 2021 21:21:57 +0900 Subject: [PATCH 1/5] Bump any_login 1.4.3 to 1.4.4 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 89712ed3f37..467db76203b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ GEM activerecord (>= 4.2) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - any_login (1.4.3) + any_login (1.4.4) rails (>= 4.2.7) ast (2.4.2) bcrypt (3.1.16) From 70ee41e1212fbf42c246cd8509bf4e23c2888562 Mon Sep 17 00:00:00 2001 From: ima1zumi Date: Thu, 21 Oct 2021 21:35:37 +0900 Subject: [PATCH 2/5] =?UTF-8?q?any=5Flogin=E3=82=92development=E3=81=AB?= =?UTF-8?q?=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 401dcd4b38c..973483ba3bb 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,6 @@ gem 'active_flag' gem 'active_storage_validations' gem 'acts_as_list' gem 'acts-as-taggable-on', '~> 7.0' -gem 'any_login' gem 'cocoon' gem 'coffee-rails', '~> 5.0.0' gem 'commonmarker' @@ -67,6 +66,7 @@ group :development do gem 'web-console', '>= 4.1.0' # not default + gem 'any_login' gem 'bullet' gem 'bundle_outdated_formatter' gem 'letter_opener_web', '~> 1.0' From c388980aec40341d53a402cbf50c77e5334f7606 Mon Sep 17 00:00:00 2001 From: ima1zumi Date: Thu, 21 Oct 2021 21:53:03 +0900 Subject: [PATCH 3/5] =?UTF-8?q?any=5Flogin=E3=81=AE=E5=AE=9A=E7=BE=A9?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E3=82=92=E6=88=BB=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit any_loginはconfig/initializers/any_login.rbに定義を書くので、production,testでもany_login.rbが読み込まれる。 その際any_loginが存在しないとエラーになるため、定義位置を戻す --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 973483ba3bb..401dcd4b38c 100644 --- a/Gemfile +++ b/Gemfile @@ -19,6 +19,7 @@ gem 'active_flag' gem 'active_storage_validations' gem 'acts_as_list' gem 'acts-as-taggable-on', '~> 7.0' +gem 'any_login' gem 'cocoon' gem 'coffee-rails', '~> 5.0.0' gem 'commonmarker' @@ -66,7 +67,6 @@ group :development do gem 'web-console', '>= 4.1.0' # not default - gem 'any_login' gem 'bullet' gem 'bundle_outdated_formatter' gem 'letter_opener_web', '~> 1.0' From 48f2b25cc09f88bd437d85444e021a287dc78284 Mon Sep 17 00:00:00 2001 From: ima1zumi Date: Thu, 21 Oct 2021 21:55:15 +0900 Subject: [PATCH 4/5] =?UTF-8?q?any=5Flogin=E3=82=92traceroute=E3=81=AE?= =?UTF-8?q?=E9=99=A4=E5=A4=96=E5=AF=BE=E8=B1=A1=E3=81=AB=E5=AE=9A=E7=BE=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 開発時しか使わないため --- .traceroute.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.traceroute.yml b/.traceroute.yml index cf45b1e703c..91d7337bdec 100644 --- a/.traceroute.yml +++ b/.traceroute.yml @@ -2,6 +2,7 @@ ignore_unused_routes: - rails\/.* - static_pages#thanks - static_pages#retire + - any_login\/.* ignore_unreachable_actions: - rails\/.* - .*#admin_login\? @@ -22,3 +23,4 @@ ignore_unreachable_actions: - reports#convert_to_ceiled_hour - reports#practice_options - home#pricing + - any_login\/.* From a2d31819b554e99e479dcc08c897f2e355c8c78c Mon Sep 17 00:00:00 2001 From: ima1zumi Date: Thu, 21 Oct 2021 21:56:50 +0900 Subject: [PATCH 5/5] =?UTF-8?q?production=E3=81=A7any=5Flogin=E3=82=92?= =?UTF-8?q?=E7=84=A1=E5=8A=B9=E5=8C=96=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/environments/production.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/environments/production.rb b/config/environments/production.rb index db1122cc6a3..7cd341671cf 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -130,4 +130,8 @@ config.hosts << ENV["CLOUD_RUN_HOST_NAME"] if ENV["CLOUD_RUN_HOST_NAME"] config.hosts << ENV["APP_HOST_NAME"] if ENV["APP_HOST_NAME"] + + AnyLogin.setup do |config| + config.enabled = false + end end