diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-17 17:43:54 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-17 17:43:54 +0200 |
| commit | 280d7b1df8566239f15130d8bf1e0e2c1d467fc0 (patch) | |
| tree | 7903e071b0013fb15dcc5a74f6143239dcbaa2c2 /config | |
| parent | 4a6bc2482a26aa0441485ca360a3d3c0eeea7fe4 (diff) | |
| parent | 59f7f4c923494bb8dd6f2881a1610c7b51240d9c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/devise.rb | 3 | ||||
| -rw-r--r-- | config/locales/en.yml | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 8532c9d9a..cd9bacf68 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -59,6 +59,8 @@ module Devise @@ldap_password = nil mattr_accessor :ldap_tls_no_verify @@ldap_tls_no_verify = false + mattr_accessor :ldap_search_filter + @@ldap_search_filter = nil class Strategies::PamAuthenticatable def valid? @@ -362,5 +364,6 @@ Devise.setup do |config| config.ldap_password = ENV.fetch('LDAP_PASSWORD') config.ldap_uid = ENV.fetch('LDAP_UID', 'cn') config.ldap_tls_no_verify = ENV['LDAP_TLS_NO_VERIFY'] == 'true' + config.ldap_search_filter = ENV.fetch('LDAP_SEARCH_FILTER', '%{uid}=%{email}') end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 4ed868c8b..ecabd9a36 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -184,6 +184,7 @@ en: unsuspend_account: "%{name} unsuspended %{target}'s account" update_custom_emoji: "%{name} updated emoji %{target}" update_status: "%{name} updated status by %{target}" + deleted_status: "(deleted status)" title: Audit log custom_emojis: by_domain: Domain @@ -401,6 +402,7 @@ en: media: title: Media no_media: No media + no_status_selected: No statuses were changed as none were selected title: Account statuses with_media: With media subscriptions: |