Version 7.10.0.rc5v7.10.0.rc5

1 files changed, 0 insertions, 41 deletions

diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
deleted file mode 100644
index bfb8656df55..00000000000
--- a/config/initializers/carrierwave.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
-
-aws_file = Rails.root.join('config', 'aws.yml')
-
-if File.exists?(aws_file)
-  AWS_CONFIG = YAML.load(File.read(aws_file))[Rails.env]
-
-  CarrierWave.configure do |config|
-    config.fog_credentials = {
-      provider: 'AWS',                                        # required
-      aws_access_key_id: AWS_CONFIG['access_key_id'],         # required
-      aws_secret_access_key: AWS_CONFIG['secret_access_key'], # required
-      region: AWS_CONFIG['region'],                           # optional, defaults to 'us-east-1'
-    }
-
-    # required
-    config.fog_directory = AWS_CONFIG['bucket']
-
-    # optional, defaults to true
-    config.fog_public = false
-
-    # optional, defaults to {}
-    config.fog_attributes = { 'Cache-Control'=>'max-age=315576000' }
-
-    # optional time (in seconds) that authenticated urls will be valid.
-    # when fog_public is false and provider is AWS or Google, defaults to 600
-    config.fog_authenticated_url_expiration = 1 << 29
-  end
-
-  # Mocking Fog requests, based on: https://github.com/carrierwaveuploader/carrierwave/wiki/How-to%3A-Test-Fog-based-uploaders
-  if Rails.env.test?
-    Fog.mock!
-    connection = ::Fog::Storage.new(
-        aws_access_key_id: AWS_CONFIG['access_key_id'],
-        aws_secret_access_key: AWS_CONFIG['secret_access_key'],
-        provider: 'AWS',
-        region: AWS_CONFIG['region']
-      )
-    connection.directories.create(key: AWS_CONFIG['bucket'])
-  end
-end