From 930aac97ebd34e4948db0a9680840f7ca898e54d Mon Sep 17 00:00:00 2001
From: Gaetan Craig-Riou <gaetan.riou@gmail.com>
Date: Wed, 14 Feb 2024 09:25:52 +1100
Subject: [PATCH] Replacing dotenv-rails by dotenv

From dotenv V3 changelog:
> The dotenv-rails gem is now superfluous. It's not technically
  deprecated yet and will continue to work, but the dotenv gem does the
  same thing. bkeepers/dotenv#468
---
 Gemfile      | 2 +-
 Gemfile.lock | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 19a87725296..259e59200e7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 ruby File.read('.ruby-version').chomp
 
-gem 'dotenv-rails', require: 'dotenv/rails-now' # Load ENV vars before other gems
+gem 'dotenv', require: 'dotenv/load' # Load ENV vars before other gems
 
 gem 'rails'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b75f558b63b..9ca13381574 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -259,9 +259,6 @@ GEM
     digest (3.1.1)
     docile (1.4.0)
     dotenv (3.0.0)
-    dotenv-rails (3.0.0)
-      dotenv (= 3.0.0)
-      railties (>= 6.1)
     email_validator (2.2.4)
       activemodel
     erubi (1.12.0)
@@ -846,7 +843,7 @@ DEPENDENCIES
   devise-token_authenticatable
   dfc_provider!
   digest
-  dotenv-rails
+  dotenv
   factory_bot_rails (= 6.2.0)
   faraday
   ffaker