From 482604dcb52dc7d58cf92fe8db719461ee174f07 Mon Sep 17 00:00:00 2001
From: momocus <momocus333@gmail.com>
Date: Sat, 3 Jul 2021 18:27:58 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20Ruby3=E3=81=A7Elasticsearch=E3=82=92?=
 =?UTF-8?q?=E5=8B=95=E3=81=8B=E3=81=99=E3=81=9F=E3=82=81=E3=81=AE=E6=9A=AB?=
 =?UTF-8?q?=E5=AE=9A=E5=87=A6=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile   |  2 +-
 Gemfile      |  2 +-
 Gemfile.lock | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9672379c8..2f5cd40dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install build tools, posgresql-client, yarn and node
 RUN apt-get update -qq && \
     DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
-    curl=7.64.* build-essential=12.6 gnupg2=2.2.* imagemagick=8:6.9.* && \
+    curl=7.64.* build-essential=12.6 gnupg2=2.2.* imagemagick=8:6.9.* git=1:2.20.* && \
     apt-get clean && \
     rm -rf /var/cache/apt/archives/* && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
diff --git a/Gemfile b/Gemfile
index 9ab74300e..d02a13c50 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ gem "era_ja"
 
 # ElasticSearch
 gem "bonsai-elasticsearch-rails"
-gem "elasticsearch-model"
+gem "elasticsearch-model", github: "indirect/elasticsearch-rails"
 gem "elasticsearch-rails"
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 65d6e8e3b..410464dbf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/indirect/elasticsearch-rails.git
+  revision: 20efbf2ca6a4d310b3e11638334d85017d923ffe
+  specs:
+    elasticsearch-model (7.1.0)
+      activesupport (> 3)
+      elasticsearch (~> 7)
+      hashie
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -135,10 +144,6 @@ GEM
       elasticsearch-transport (= 7.13.1)
     elasticsearch-api (7.13.1)
       multi_json
-    elasticsearch-model (7.1.1)
-      activesupport (> 3)
-      elasticsearch (> 1)
-      hashie
     elasticsearch-rails (7.1.1)
     elasticsearch-transport (7.13.1)
       faraday (~> 1)
@@ -426,7 +431,7 @@ DEPENDENCIES
   devise
   devise-i18n
   dotenv-rails
-  elasticsearch-model
+  elasticsearch-model!
   elasticsearch-rails
   enum_help
   era_ja