nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
danielvincent 2010-10-07 15:22:14 -07:00
commit 6531a27594
5 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -36,6 +36,7 @@ gem 'magent', :git => 'http://github.com/dcu/magent.git'
#File uploading #File uploading
gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
gem 'mini_magick' gem 'mini_magick'
gem 'aws'
group :test, :development do group :test, :development do
gem 'factory_girl_rails' gem 'factory_girl_rails'

7
Gemfile.lock
View file

@ -99,6 +99,10 @@ GEM
arel (1.0.1) arel (1.0.1)
activesupport (~> 3.0.0) activesupport (~> 3.0.0)
autotest (4.3.2) autotest (4.3.2)
aws (2.3.21)
http_connection
uuidtools
xml-simple
bcrypt-ruby (2.1.2) bcrypt-ruby (2.1.2)
bson (1.0.7) bson (1.0.7)
bson_ext (1.0.7) bson_ext (1.0.7)
@ -149,6 +153,7 @@ GEM
haml (3.0.18) haml (3.0.18)
hashie (0.4.0) hashie (0.4.0)
highline (1.6.1) highline (1.6.1)
http_connection (1.3.1)
i18n (0.4.1) i18n (0.4.1)
json (1.4.6) json (1.4.6)
json_pure (1.4.6) json_pure (1.4.6)
@ -249,6 +254,7 @@ GEM
rack (>= 1.0) rack (>= 1.0)
rack-test (>= 0.5.3) rack-test (>= 0.5.3)
will_paginate (3.0.pre2) will_paginate (3.0.pre2)
xml-simple (1.0.12)
PLATFORMS PLATFORMS
ruby ruby
@ -256,6 +262,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
addressable addressable
autotest autotest
aws
bson (= 1.0.7) bson (= 1.0.7)
bson_ext (= 1.0.7) bson_ext (= 1.0.7)
bundler (>= 1.0.0) bundler (>= 1.0.0)

2
app/uploaders/image_uploader.rb
View file

@ -5,8 +5,6 @@
class ImageUploader < CarrierWave::Uploader::Base class ImageUploader < CarrierWave::Uploader::Base
include CarrierWave::MiniMagick include CarrierWave::MiniMagick
storage :file
def store_dir def store_dir
"uploads/images" "uploads/images"
end end

10
config/initializers/carrierwave.rb
View file

@ -3,5 +3,13 @@
# the COPYRIGHT file. # the COPYRIGHT file.
CarrierWave.configure do |config| CarrierWave.configure do |config|
config.storage = :file if ENV['S3_KEY'] && ENV['S3_SECRET'] && ENV['S3_BUCKET']
config.storage = :s3
config.s3_access_key_id = ENV['S3_KEY']
config.s3_secret_access_key = ENV['S3_SECRET']
config.s3_bucket = ENV['S3_BUCKET']
config.cache_dir = "#{Rails.root}/tmp/uploads"
else
config.storage = :file
end
end end

2
config/initializers/mailer_config.rb
View file

@ -7,7 +7,7 @@ Diaspora::Application.configure do
config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]} config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]}
config.action_mailer.smtp_settings = { config.action_mailer.smtp_settings = {
:address => APP_CONFIG[:smtp_address], :address => APP_CONFIG[:smtp_address],
:port => APP_CONFIG[:smtp_port], :port => APP_CONFIG[:smtp_port].to_i,
:domain => APP_CONFIG[:smtp_domain], :domain => APP_CONFIG[:smtp_domain],
:authentication => APP_CONFIG[:smtp_authentication], :authentication => APP_CONFIG[:smtp_authentication],
:user_name => APP_CONFIG[:smtp_username], :user_name => APP_CONFIG[:smtp_username],