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 /Gemfile.lock | |
| 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 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c05b85b2a..ecc81db92 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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 |