diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-10-03 11:10:12 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-10-03 11:10:12 +0200 |
commit | a84aedb7a7f050cbf5293351723f55a904992b3a (patch) | |
tree | 769d397390665bcddf9b44fc1ad4418b2757c5f1 /.env.production.sample | |
parent | 857c67f31b23b9c496e07eda41755ba449a37f17 (diff) | |
parent | bae268b2f6501ccb0ceeb8dd36180698839c4d3c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.
Diffstat (limited to '.env.production.sample')
-rw-r--r-- | .env.production.sample | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.env.production.sample b/.env.production.sample index 417e91528..b77e4e417 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -203,7 +203,7 @@ STREAMING_CLUSTER_NUM=1 # LDAP_BIND_DN= # LDAP_PASSWORD= # LDAP_UID=cn -# LDAP_SEARCH_FILTER="%{uid}=%{email}" +# LDAP_SEARCH_FILTER=%{uid}=%{email} # PAM authentication (optional) # PAM authentication uses for the email generation the "email" pam variable |