tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
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.
This commit is contained in:
Thibaut Girka
2019-10-03 11:10:12 +02:00
parent 857c67f31b bae268b2f6
commit a84aedb7a7
168 changed files with 3456 additions and 997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.production.sample
View File

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