Merge pull request #66 from arka-g/cancel_aws

Remove AWS S3 integration 🔥😭
arka-g · Mar 21, 2016 · 8b6bd7e · 8b6bd7e
2 parents 29e668a + 57c6a76
commit 8b6bd7e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 17 deletions.
diff --git a/Gemfile b/Gemfile
@@ -33,7 +33,6 @@ gem 'devise', '~> 3.5', '>= 3.5.2'
 gem 'acts_as_votable', '~> 0.10.0'
 gem 'will_paginate', '~> 3.0', '>= 3.0.7'
 gem 'normalize-rails', '~> 3.0', '>= 3.0.3'
-gem 'aws-sdk', '< 2.0'
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -38,11 +38,6 @@ GEM
       tzinfo (~> 1.1)
     acts_as_votable (0.10.0)
     arel (6.0.3)
-    aws-sdk (1.66.0)
-      aws-sdk-v1 (= 1.66.0)
-    aws-sdk-v1 (1.66.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
     bcrypt (3.1.10)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
@@ -176,7 +171,6 @@ PLATFORMS
 
 DEPENDENCIES
   acts_as_votable (~> 0.10.0)
-  aws-sdk (< 2.0)
   byebug
   coffee-rails (~> 4.1.0)
   devise (~> 3.5, >= 3.5.2)

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -76,14 +76,4 @@
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
-
-  # Makes Paperclip upload images to Amazon S3
-  config.paperclip_defaults = {
-    :storage => :s3,
-    :s3_credentials => {
-      :bucket => ENV['S3_BUCKET_NAME'],
-      :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
-      :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY']
-    }
-  }
 end