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

Merge remote-tracking branch 'origin/develop' into shigusegubu

Browse source 
* origin/develop: (330 commits)
  Translated using Weblate (Chinese (Simplified))
  Minor refactoring of the logic for hiding followers/following counts.
  changelog
  Fix for dropping posts/notifs in WS when mix task is executed
  Fixed Rich Media Previews
  Majic: specify commit so source users do not get surprise updates
  Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix
  instance.gen: Warn that stripping exif requires exiftool
  instance.gen task: Only show files which will be actually overwritten
  Translated using Weblate (Ukrainian)
  Added translation using Weblate (Ukrainian)
  Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).
  Changed default OAuth token expiration time to 30 days.
  [#3112] .gitattributes fix.
  Update CHANGELOG
  ApplicationRequirements: Add test, more text for pool size.
  Apply 1 suggestion(s) to 1 file(s)
  Add a startup error for modified Repo pool_size
  instance.reachable?: Limit to binary input
  instance: Do not fetch unreachable instances
  ...
This commit is contained in:
Henry Jameson 2020-12-17 11:27:54 +02:00
commit d5afe8a884
506 changed files with 15318 additions and 6900 deletions
Download patch file Download diff file Expand all files Collapse all files

1
installation/init.d/pleroma
View file

@ -8,7 +8,6 @@ pidfile="/var/run/pleroma.pid"
directory=/opt/pleroma
healthcheck_delay=60
healthcheck_timer=30
export $(cat /opt/pleroma/config/pleroma.env)
: ${pleroma_port:-4000}

5
installation/pleroma.nginx
View file

@ -93,9 +93,4 @@ server {
chunked_transfer_encoding on;
proxy_pass http://phoenix;
}
location /api/fedsocket/v1 {
proxy_request_buffering off;
proxy_pass http://phoenix/api/fedsocket/v1;
}
}