* Revert "Bump version to 2.3.2rc1" This reverts commitmastercdf8b92fea
. * Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)" This reverts commit0074cad44f
. * Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)" This reverts commit4a0a19fe54
. * Revert "Correct the reference to user's password in mastodon:add_user task (#6800)" This reverts commit338bff8b93
. * Revert "Upgrade Paperclip to version 6.0.0 (#6754)" This reverts commitb88fcd53f7
.
@@ -13,11 +13,11 @@ gem 'pg', '~> 0.20' | |||||
gem 'pghero', '~> 1.7' | gem 'pghero', '~> 1.7' | ||||
gem 'dotenv-rails', '~> 2.2' | gem 'dotenv-rails', '~> 2.2' | ||||
gem 'aws-sdk-s3', '~> 1.8', require: false | |||||
gem 'aws-sdk', '~> 2.10', require: false | |||||
gem 'fog-core', '~> 1.45' | gem 'fog-core', '~> 1.45' | ||||
gem 'fog-local', '~> 0.4', require: false | gem 'fog-local', '~> 0.4', require: false | ||||
gem 'fog-openstack', '~> 0.1', require: false | gem 'fog-openstack', '~> 0.1', require: false | ||||
gem 'paperclip', '~> 6.0' | |||||
gem 'paperclip', '~> 5.1' | |||||
gem 'paperclip-av-transcoder', '~> 0.6' | gem 'paperclip-av-transcoder', '~> 0.6' | ||||
gem 'streamio-ffmpeg', '~> 3.0' | gem 'streamio-ffmpeg', '~> 3.0' | ||||
@@ -57,18 +57,13 @@ GEM | |||||
encryptor (~> 3.0.0) | encryptor (~> 3.0.0) | ||||
av (0.9.0) | av (0.9.0) | ||||
cocaine (~> 0.5.3) | 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) | aws-sigv4 (~> 1.0) | ||||
jmespath (~> 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) | aws-sigv4 (1.0.2) | ||||
bcrypt (3.1.11) | bcrypt (3.1.11) | ||||
better_errors (2.4.0) | better_errors (2.4.0) | ||||
@@ -241,7 +236,7 @@ GEM | |||||
httplog (0.99.7) | httplog (0.99.7) | ||||
colorize | colorize | ||||
rack | rack | ||||
i18n (0.9.5) | |||||
i18n (0.9.3) | |||||
concurrent-ruby (~> 1.0) | concurrent-ruby (~> 1.0) | ||||
i18n-tasks (0.9.19) | i18n-tasks (0.9.19) | ||||
activesupport (>= 4.0.2) | activesupport (>= 4.0.2) | ||||
@@ -347,12 +342,12 @@ GEM | |||||
http (~> 3.0) | http (~> 3.0) | ||||
nokogiri (~> 1.8) | nokogiri (~> 1.8) | ||||
ox (2.8.2) | ox (2.8.2) | ||||
paperclip (6.0.0) | |||||
paperclip (5.2.1) | |||||
activemodel (>= 4.2.0) | activemodel (>= 4.2.0) | ||||
activesupport (>= 4.2.0) | activesupport (>= 4.2.0) | ||||
cocaine (~> 0.5.5) | |||||
mime-types | mime-types | ||||
mimemagic (~> 0.3.0) | mimemagic (~> 0.3.0) | ||||
terrapin (~> 0.6.0) | |||||
paperclip-av-transcoder (0.6.4) | paperclip-av-transcoder (0.6.4) | ||||
av (~> 0.9.0) | av (~> 0.9.0) | ||||
paperclip (>= 2.5.2) | paperclip (>= 2.5.2) | ||||
@@ -557,8 +552,6 @@ GEM | |||||
temple (0.8.0) | temple (0.8.0) | ||||
terminal-table (1.8.0) | terminal-table (1.8.0) | ||||
unicode-display_width (~> 1.1, >= 1.1.1) | unicode-display_width (~> 1.1, >= 1.1.1) | ||||
terrapin (0.6.0) | |||||
climate_control (>= 0.0.3, < 1.0) | |||||
thor (0.20.0) | thor (0.20.0) | ||||
thread (0.2.2) | thread (0.2.2) | ||||
thread_safe (0.3.6) | thread_safe (0.3.6) | ||||
@@ -582,7 +575,7 @@ GEM | |||||
tty-screen (0.6.4) | tty-screen (0.6.4) | ||||
twitter-text (1.14.7) | twitter-text (1.14.7) | ||||
unf (~> 0.1.0) | unf (~> 0.1.0) | ||||
tzinfo (1.2.5) | |||||
tzinfo (1.2.4) | |||||
thread_safe (~> 0.1) | thread_safe (~> 0.1) | ||||
tzinfo-data (1.2017.3) | tzinfo-data (1.2017.3) | ||||
tzinfo (>= 1.0.0) | tzinfo (>= 1.0.0) | ||||
@@ -619,7 +612,7 @@ DEPENDENCIES | |||||
active_record_query_trace (~> 1.5) | active_record_query_trace (~> 1.5) | ||||
addressable (~> 2.5) | addressable (~> 2.5) | ||||
annotate (~> 2.7) | annotate (~> 2.7) | ||||
aws-sdk-s3 (~> 1.8) | |||||
aws-sdk (~> 2.10) | |||||
better_errors (~> 2.4) | better_errors (~> 2.4) | ||||
binding_of_caller (~> 0.7) | binding_of_caller (~> 0.7) | ||||
bootsnap | bootsnap | ||||
@@ -678,7 +671,7 @@ DEPENDENCIES | |||||
omniauth-saml (~> 1.10) | omniauth-saml (~> 1.10) | ||||
ostatus2 (~> 2.0) | ostatus2 (~> 2.0) | ||||
ox (~> 2.8) | ox (~> 2.8) | ||||
paperclip (~> 6.0) | |||||
paperclip (~> 5.1) | |||||
paperclip-av-transcoder (~> 0.6) | paperclip-av-transcoder (~> 0.6) | ||||
parallel_tests (~> 2.17) | parallel_tests (~> 2.17) | ||||
pg (~> 0.20) | pg (~> 0.20) | ||||
@@ -14,7 +14,8 @@ Paperclip::Attachment.default_options.merge!( | |||||
) | ) | ||||
if ENV['S3_ENABLED'] == 'true' | if ENV['S3_ENABLED'] == 'true' | ||||
require 'aws-sdk-s3' | |||||
require 'aws-sdk' | |||||
Aws.eager_autoload!(services: %w(S3)) | |||||
s3_region = ENV.fetch('S3_REGION') { 'us-east-1' } | s3_region = ENV.fetch('S3_REGION') { 'us-east-1' } | ||||
s3_protocol = ENV.fetch('S3_PROTOCOL') { 'https' } | s3_protocol = ENV.fetch('S3_PROTOCOL') { 'https' } | ||||