glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove secrets.yml stuff because it doesn't work with heroku

Browse source
This commit is contained in:
Devin Howard 2015-10-30 14:30:24 +08:00 committed by Connor Turland
parent 10b58399a7
commit 3674aefb04
3 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/map.rb
View file

@ -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/

2
app/models/user.rb
View file

@ -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/

12
config/secrets.yml.default
View file

@ -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