zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Replace deprecated `dotenv-rails` gem with `dotenv` gem (#29173)

This commit is contained in:
Matt Jankowski 2024-04-19 10:25:14 -04:00 committed by GitHub
parent ec71c02c4b
commit f386eb6c63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -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'

7
Gemfile.lock
View File

@ -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)

2
config/application.rb
View File

@ -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'