diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-17 14:20:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-17 14:20:35 +0100 |
| commit | 40871caa4b06c7ee1c3b07f439ed984ead295ced (patch) | |
| tree | 0c7c94b578d9ba5170fe03c432c1de20633fd776 /Gemfile.lock | |
| parent | cdf8b92fea269209cedf38c50bca276cdf47b1fe (diff) | |
Revert "Upgrade Paperclip to version 6.0.0" (#6807)v2.3.2rc1
* Revert "Bump version to 2.3.2rc1"
This reverts commit cdf8b92fea269209cedf38c50bca276cdf47b1fe.
* Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)"
This reverts commit 0074cad44ffcbbdbc798f57a21829359741e60d9.
* Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)"
This reverts commit 4a0a19fe54f1d2d433ad3d72c35f2bbb915279f6.
* Revert "Correct the reference to user's password in mastodon:add_user task (#6800)"
This reverts commit 338bff8b93fa939c2968818e53386fd0c013d9a9.
* Revert "Upgrade Paperclip to version 6.0.0 (#6754)"
This reverts commit b88fcd53f711673b21e5ff4a547dbf929866a2ee.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index dd17be944d5..0640b140b17 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,18 +57,13 @@ GEM encryptor (~> 3.0.0) av (0.9.0) cocaine (~> 0.5.3) - aws-partitions (1.70.0) - aws-sdk-core (3.17.0) - aws-partitions (~> 1.0) + aws-sdk (2.10.100) + aws-sdk-resources (= 2.10.100) + aws-sdk-core (2.10.100) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-kms (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.8.2) - aws-sdk-core (~> 3) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.0) + aws-sdk-resources (2.10.100) + aws-sdk-core (= 2.10.100) aws-sigv4 (1.0.2) bcrypt (3.1.11) better_errors (2.4.0) @@ -241,7 +236,7 @@ GEM httplog (0.99.7) colorize rack - i18n (0.9.5) + i18n (0.9.3) concurrent-ruby (~> 1.0) i18n-tasks (0.9.19) activesupport (>= 4.0.2) @@ -347,12 +342,12 @@ GEM http (~> 3.0) nokogiri (~> 1.8) ox (2.8.2) - paperclip (6.0.0) + paperclip (5.2.1) activemodel (>= 4.2.0) activesupport (>= 4.2.0) + cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) - terrapin (~> 0.6.0) paperclip-av-transcoder (0.6.4) av (~> 0.9.0) paperclip (>= 2.5.2) @@ -557,8 +552,6 @@ GEM temple (0.8.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - terrapin (0.6.0) - climate_control (>= 0.0.3, < 1.0) thor (0.20.0) thread (0.2.2) thread_safe (0.3.6) @@ -582,7 +575,7 @@ GEM tty-screen (0.6.4) twitter-text (1.14.7) unf (~> 0.1.0) - tzinfo (1.2.5) + tzinfo (1.2.4) thread_safe (~> 0.1) tzinfo-data (1.2017.3) tzinfo (>= 1.0.0) @@ -619,7 +612,7 @@ DEPENDENCIES active_record_query_trace (~> 1.5) addressable (~> 2.5) annotate (~> 2.7) - aws-sdk-s3 (~> 1.8) + aws-sdk (~> 2.10) better_errors (~> 2.4) binding_of_caller (~> 0.7) bootsnap @@ -678,7 +671,7 @@ DEPENDENCIES omniauth-saml (~> 1.10) ostatus2 (~> 2.0) ox (~> 2.8) - paperclip (~> 6.0) + paperclip (~> 5.1) paperclip-av-transcoder (~> 0.6) parallel_tests (~> 2.17) pg (~> 0.20) |