From 8b34ef58fb3c14d64df5baffe40f056209b0430a Mon Sep 17 00:00:00 2001 From: Sion908 Date: Wed, 23 Oct 2024 10:02:37 +0900 Subject: [PATCH 1/4] =?UTF-8?q?city=5Fos=E3=81=AEomniauth=E3=82=92?= =?UTF-8?q?=E5=B0=8E=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 1 + Gemfile.lock | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b1608230c..7f2c12bb5 100644 --- a/Gemfile +++ b/Gemfile @@ -29,6 +29,7 @@ gem "image_processing" gem "newrelic_rpm" gem "omniauth-line_login", path: "omniauth-line_login" +gem "omniauth-cityos-dcp", git: "https://github.com/TheDesignium/omniauth-cityos-dcp.git", tag: "v1.0" gem "omniauth-rails_csrf_protection" gem "decidim-user_extension", path: "decidim-user_extension" diff --git a/Gemfile.lock b/Gemfile.lock index a7973fc8c..874fcb3b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: https://github.com/TheDesignium/omniauth-cityos-dcp.git + revision: d41dec73ce9e47177227d375daae126085e8dab9 + tag: v1.0 + specs: + omniauth-cityos-dcp (0.1.0) + decidim (>= 0.27.0, < 0.28.0) + omniauth-oauth2 + GIT remote: https://github.com/codeforjapan/decidim-module-decidim_awesome.git revision: 30f39e79c65c6de3e9c569d8233e586113bff020 @@ -949,6 +958,7 @@ DEPENDENCIES letter_opener_web (~> 2.0) listen (~> 3.1) newrelic_rpm + omniauth-cityos-dcp! omniauth-line_login! omniauth-rails_csrf_protection puma (>= 5.6.2) @@ -969,4 +979,4 @@ RUBY VERSION ruby 3.0.6p216 BUNDLED WITH - 2.2.33 + 2.3.7 From 6883c8ebfa56c535cb484418641aa82e33966ca3 Mon Sep 17 00:00:00 2001 From: Sion908 Date: Mon, 28 Oct 2024 02:30:46 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9?= =?UTF-8?q?=E3=83=AA=E3=81=AE=E3=82=A2=E3=83=97=E3=83=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7f2c12bb5..e6f7236eb 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ gem "image_processing" gem "newrelic_rpm" gem "omniauth-line_login", path: "omniauth-line_login" -gem "omniauth-cityos-dcp", git: "https://github.com/TheDesignium/omniauth-cityos-dcp.git", tag: "v1.0" +gem "omniauth-cityos-dcp", git: "https://github.com/TheDesignium/omniauth-cityos-dcp.git", tag: "v1.1.0" gem "omniauth-rails_csrf_protection" gem "decidim-user_extension", path: "decidim-user_extension" diff --git a/Gemfile.lock b/Gemfile.lock index 874fcb3b2..0e1cff59d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/TheDesignium/omniauth-cityos-dcp.git - revision: d41dec73ce9e47177227d375daae126085e8dab9 - tag: v1.0 + revision: 056321744dd4ad5e9bc44380de53bd320c0368c7 + tag: v1.1.0 specs: omniauth-cityos-dcp (0.1.0) decidim (>= 0.27.0, < 0.28.0) From dbafbd9344afa7fd63ba417d485e42e6d161589e Mon Sep 17 00:00:00 2001 From: Sion908 Date: Mon, 28 Oct 2024 15:40:05 +0900 Subject: [PATCH 3/4] =?UTF-8?q?nginx=E3=81=AE=E3=83=98=E3=83=83=E3=83=80?= =?UTF-8?q?=E3=83=BC=E3=82=B5=E3=82=A4=E3=82=BA=E3=82=92=E3=81=8A=E3=81=8A?= =?UTF-8?q?=E3=81=8D=E3=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- etc/nginx/conf.d/default.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/nginx/conf.d/default.conf b/etc/nginx/conf.d/default.conf index cd79a87c2..9ee2dc449 100644 --- a/etc/nginx/conf.d/default.conf +++ b/etc/nginx/conf.d/default.conf @@ -23,5 +23,7 @@ server { proxy_set_header Host $host:$proxy_port; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_buffers 8 16k; + proxy_buffer_size 32k; } } From 6fa02f3e265f92d72796d60bcd3a9397327bc509 Mon Sep 17 00:00:00 2001 From: Sion908 Date: Mon, 28 Oct 2024 16:15:45 +0900 Subject: [PATCH 4/4] =?UTF-8?q?gem=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E9=A0=86=E7=95=AA=E3=81=AE=E5=A4=89=E6=9B=B4?= 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 e6f7236eb..63317b4e1 100644 --- a/Gemfile +++ b/Gemfile @@ -28,8 +28,8 @@ gem "deface" gem "image_processing" gem "newrelic_rpm" -gem "omniauth-line_login", path: "omniauth-line_login" gem "omniauth-cityos-dcp", git: "https://github.com/TheDesignium/omniauth-cityos-dcp.git", tag: "v1.1.0" +gem "omniauth-line_login", path: "omniauth-line_login" gem "omniauth-rails_csrf_protection" gem "decidim-user_extension", path: "decidim-user_extension"