Skip to content
Extraits de code Groupes Projets
Valider 995d285f rédigé par zhitomirskiyi's avatar zhitomirskiyi
Parcourir les fichiers

ssl s3, attrs

parent 0c8aca3e
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -34,7 +34,7 @@ gem 'thin', '1.2.7', :require => false ...@@ -34,7 +34,7 @@ gem 'thin', '1.2.7', :require => false
gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket', :ref => 'e278f5a1c4db60be7485' gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket', :ref => 'e278f5a1c4db60be7485'
#File uploading #File uploading
gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch gem 'carrierwave', :git => 'git://github.com/recruitmilitary/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
gem 'mini_magick', '3.2' gem 'mini_magick', '3.2'
gem 'aws', '2.3.32' # upgrade to 2.4 breaks 1.8 >.< gem 'aws', '2.3.32' # upgrade to 2.4 breaks 1.8 >.<
gem 'fastercsv', '1.5.4', :require => false gem 'fastercsv', '1.5.4', :require => false
......
...@@ -37,8 +37,8 @@ GIT ...@@ -37,8 +37,8 @@ GIT
simple_oauth (~> 0.1.2) simple_oauth (~> 0.1.2)
GIT GIT
remote: git://github.com/rsofaer/carrierwave.git remote: git://github.com/recruitmilitary/carrierwave.git
revision: a42dfa25023775be82d7eb9bc9edb675986b1f40 revision: a30bb2603a51b646fd771065d6c203abef2e936e
branch: master branch: master
specs: specs:
carrierwave (0.5.0) carrierwave (0.5.0)
......
...@@ -9,8 +9,8 @@ class Photo < Post ...@@ -9,8 +9,8 @@ class Photo < Post
xml_attr :remote_photo_path xml_attr :remote_photo_path
xml_attr :remote_photo_name xml_attr :remote_photo_name
xml_reader :caption xml_attr :caption
xml_reader :status_message_id xml_attr :status_message_id
belongs_to :status_message belongs_to :status_message
......
...@@ -8,6 +8,7 @@ CarrierWave.configure do |config| ...@@ -8,6 +8,7 @@ CarrierWave.configure do |config|
config.s3_access_key_id = AppConfig[:s3_key] config.s3_access_key_id = AppConfig[:s3_key]
config.s3_secret_access_key = AppConfig[:s3_secret] config.s3_secret_access_key = AppConfig[:s3_secret]
config.s3_bucket = AppConfig[:s3_bucket] config.s3_bucket = AppConfig[:s3_bucket]
config.s3_use_ssl = true
config.cache_dir = "#{Rails.root}/tmp/uploads" config.cache_dir = "#{Rails.root}/tmp/uploads"
else else
config.storage = :file config.storage = :file
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter