From 3674aefb04880781076adae94529e08523ed2800 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Fri, 30 Oct 2015 14:30:24 +0800 Subject: [PATCH] remove secrets.yml stuff because it doesn't work with heroku --- app/models/map.rb | 2 +- app/models/user.rb | 2 +- config/secrets.yml.default | 12 ------------ 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 config/secrets.yml.default diff --git a/app/models/map.rb b/app/models/map.rb index 091c684b..e6a10605 100644 --- a/app/models/map.rb +++ b/app/models/map.rb @@ -12,7 +12,7 @@ class Map < ActiveRecord::Base :thumb => ['188x126#', :png] #:full => ['940x630#', :png] }, - :default_url => Rails.application.secrets.missing_map_png_url + :default_url => 'https://s3.amazonaws.com/metamaps-assets/site/missing-map.png' # Validate the attached image is image/jpg, image/png, etc validates_attachment_content_type :screenshot, :content_type => /\Aimage\/.*\Z/ diff --git a/app/models/user.rb b/app/models/user.rb index 8471f6b9..f6b0d65a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -35,7 +35,7 @@ class User < ActiveRecord::Base :ninetysix => ['96x96#', :png], :onetwentyeight => ['128x128#', :png] }, - :default_url => Rails.application.secrets.user_png_url + :default_url => 'https://s3.amazonaws.com/metamaps-assets/site/user.png' # Validate the attached image is image/jpg, image/png, etc validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/ diff --git a/config/secrets.yml.default b/config/secrets.yml.default deleted file mode 100644 index eb35a382..00000000 --- a/config/secrets.yml.default +++ /dev/null @@ -1,12 +0,0 @@ -defaults: &defaults - missing_map_png_url: 'https://s3.amazonaws.com/metamaps-assets/site/missing-map.png' - user_png_url: 'https://s3.amazonaws.com/metamaps-assets/site/user.png' - -development: - <<: *defaults - -test: - <<: *defaults - -production: - <<: *defaults