diff options
| author | Matt Jankowski <matt@jankowski.online> | 2024-04-19 10:25:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-19 14:25:14 +0000 |
| commit | f386eb6c6300440cd96e47af4b19481d2ee2f219 (patch) | |
| tree | e7fae006153e8fefb8c290070f1625610637e6f9 | |
| parent | ec71c02c4b028c3541742f023729aeb295a51559 (diff) | |
Replace deprecated `dotenv-rails` gem with `dotenv` gem (#29173)
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 7 | ||||
| -rw-r--r-- | config/application.rb | 2 |
3 files changed, 4 insertions, 7 deletions
@@ -12,7 +12,7 @@ gem 'thor', '~> 1.2' # For why irb is in the Gemfile, see: https://ruby.social/@st0012/111444685161478182 gem 'irb', '~> 1.8' -gem 'dotenv-rails', '~> 2.8' +gem 'dotenv' gem 'haml-rails', '~>2.0' gem 'pg', '~> 1.5' gem 'pghero' diff --git a/Gemfile.lock b/Gemfile.lock index 752d4e05e01..6e5611b23ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -220,10 +220,7 @@ GEM domain_name (0.6.20240107) doorkeeper (5.6.9) railties (>= 5) - dotenv (2.8.1) - dotenv-rails (2.8.1) - dotenv (= 2.8.1) - railties (>= 3.2) + dotenv (3.1.0) drb (2.2.1) ed25519 (1.3.0) elasticsearch (7.13.3) @@ -848,7 +845,7 @@ DEPENDENCIES devise_pam_authenticatable2 (~> 9.2) discard (~> 1.2) doorkeeper (~> 5.6) - dotenv-rails (~> 2.8) + dotenv ed25519 (~> 1.3) email_spec fabrication (~> 2.30) diff --git a/config/application.rb b/config/application.rb index bab1b46cb0c..a17a48b093b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -52,7 +52,7 @@ require_relative '../lib/active_record/batches' require_relative '../lib/simple_navigation/item_extensions' require_relative '../lib/http_extensions' -Dotenv::Railtie.load +Dotenv::Rails.load Bundler.require(:pam_authentication) if ENV['PAM_ENABLED'] == 'true' |