From 8cbdec223977bb12007821f69cc30ff6b0e2fab2 Mon Sep 17 00:00:00 2001
From: Captain <pongdanai@nimblehq.co>
Date: Mon, 17 Apr 2023 12:40:16 +0700
Subject: [PATCH] [skip ci][#1] Setup project. Fix gem psych version error on
 Ruby 3.1 or above

---
 Gemfile      | 3 ++-
 Gemfile.lock | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 923b816..42597d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,8 @@ gem 'jsbundling-rails' # Bundle and transpile JavaScript
 gem 'i18n-js', '3.9.0' # A library to provide the I18n translations on the Javascript
 # gem 'devise-i18n' # Translations for Devise
 
-gem 'psych', '< 4.0'
+# Fix Ruby 3.1 that uses psych version 4.0 and conflicts with rails-template
+gem 'psych', '3.3.4'
 
 group :development do
   gem 'foreman' # Manage Procfile-based applications
diff --git a/Gemfile.lock b/Gemfile.lock
index a8c5a14..ab8cb18 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -492,7 +492,7 @@ DEPENDENCIES
   pg
   pry-byebug
   pry-rails
-  psych (< 4.0)
+  psych (= 3.3.4)
   puma
   pundit
   rack-timeout