techhub/mastodon
2
0
Fork 0
Code Activity

Fix Style/FetchEnvVar cop in devise config (#34846)

Browse Source
This commit is contained in:
Matt Jankowski
2025-05-30 03:00:37 -04:00
committed by GitHub
parent f7a3dd0e38
commit 3c09fd3f89
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.rubocop_todo.yml
View File

@@ -38,7 +38,6 @@ Style/FetchEnvVar:
- 'config/initializers/2_limited_federation_mode.rb'
- 'config/initializers/3_omniauth.rb'
- 'config/initializers/cache_buster.rb'
- 'config/initializers/devise.rb'
- 'config/initializers/paperclip.rb'
- 'lib/tasks/repo.rake'

2
config/initializers/devise.rb
View File

@@ -377,7 +377,7 @@ Devise.setup do |config|
config.usernamefield = nil
config.emailfield = 'email'
config.check_at_sign = true
config.pam_default_suffix = ENV.fetch('PAM_EMAIL_DOMAIN') { ENV['LOCAL_DOMAIN'] }
config.pam_default_suffix = ENV.fetch('PAM_EMAIL_DOMAIN') { ENV.fetch('LOCAL_DOMAIN', nil) }
config.pam_default_service = ENV.fetch('PAM_DEFAULT_SERVICE') { 'rpam' }
config.pam_controlled_service = ENV.fetch('PAM_CONTROLLED_SERVICE', nil).presence
end