hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into 'feature/autofollowing'

Browse source 
# Conflicts:
#   CHANGELOG.md
This commit is contained in:
feld 2020-10-27 22:13:50 +00:00
commit 03a318af9a
7 changed files with 190 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config/config.exs
View file

@ -636,7 +636,12 @@ config :pleroma, Pleroma.Emails.UserEmail,
config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: false
config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics"
config :prometheus, Pleroma.Web.Endpoint.MetricsExporter,
enabled: false,
auth: false,
ip_whitelist: [],
path: "/api/pleroma/app_metrics",
format: :text
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 25,