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

3
Gemfile.lock
View File

@ -752,6 +752,7 @@ DEPENDENCIES
ox (~> 2.11)
paperclip (~> 6.0)
paperclip-av-transcoder (~> 0.6)
parallel (~> 1.17)
parallel_tests (~> 2.29)
parslet
pg (~> 1.1)
@ -804,7 +805,7 @@ DEPENDENCIES
webpush
RUBY VERSION
ruby 2.6.4p104
ruby 2.6.5p105
BUNDLED WITH
1.17.3