diff options
| author | ThibG <thib@sitedethib.com> | 2021-01-11 13:44:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 13:44:57 +0100 |
| commit | a7a47834e50645746355e2b9a88244c1804c73cd (patch) | |
| tree | 3b81b1d2a4b2c2d2e4b29948c72a7995a21fa449 /config | |
| parent | d42e7e01dcd464f80637682d4eee6e5a7f36f26e (diff) | |
| parent | 31e68bf3d35b80e794c1a44b3d60dabcf10f2a3d (diff) | |
Merge pull request #1483 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/initializers/omniauth.rb | 1 | ||||
| -rw-r--r-- | config/locales/devise.en.yml | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index af7735221..696dc17e6 100644 --- a/config/application.rb +++ b/config/application.rb @@ -7,6 +7,7 @@ require 'rails/all' Bundler.require(*Rails.groups) require_relative '../app/lib/exceptions' +require_relative '../lib/enumerable' require_relative '../lib/redis/namespace_extensions' require_relative '../lib/paperclip/url_generator_extensions' require_relative '../lib/paperclip/attachment_extensions' diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index e8d7697a1..9e037f421 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -60,6 +60,7 @@ Devise.setup do |config| saml_options[:attribute_statements][:verified] = [ENV['SAML_ATTRIBUTES_STATEMENTS_VERIFIED']] if ENV['SAML_ATTRIBUTES_STATEMENTS_VERIFIED'] saml_options[:attribute_statements][:verified_email] = [ENV['SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL']] if ENV['SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL'] saml_options[:uid_attribute] = ENV['SAML_UID_ATTRIBUTE'] if ENV['SAML_UID_ATTRIBUTE'] + saml_options[:allowed_clock_drift] = ENV['SAML_ALLOWED_CLOCK_DRIFT'] if ENV['SAML_ALLOWED_CLOCK_DRIFT'] config.omniauth :saml, saml_options end end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index a3f2c5796..cc4140d14 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -68,7 +68,7 @@ en: deleted: explanation: The following security key has been deleted from your account subject: 'Mastodon: Security key deleted' - title: One of you security keys has been deleted + title: One of your security keys has been deleted webauthn_disabled: explanation: Authentication with security keys has been disabled for your account. Login is now possible using only the token generated by the paired TOTP app. subject: 'Mastodon: Authentication with security keys disabled' |