Permalink
Browse files

Update alonetone.example.yml

  • Loading branch information...
sudara committed Feb 13, 2013
1 parent 1290e51 commit ac87ed9ea4f9b9a9a48251c5cebb948c05395b8f
Showing with 34 additions and 40 deletions.
  1. +31 −31 Gemfile.lock
  2. +1 −8 app/models/source_file.rb
  3. +2 −1 config/alonetone.example.yml
View
@@ -29,31 +29,31 @@ GEM
Platform (>= 0.4.0)
open4
Platform (0.4.0)
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
+ actionmailer (3.2.12)
+ actionpack (= 3.2.12)
mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ actionpack (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
- rack (~> 1.4.0)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.11)
- activesupport (= 3.2.11)
+ activemodel (3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ activerecord (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
+ activeresource (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
+ activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_list (0.1.8)
@@ -136,7 +136,7 @@ GEM
jquery-ui-rails (2.0.2)
jquery-rails
railties (>= 3.1.0)
- json (1.7.6)
+ json (1.7.7)
kgio (2.7.4)
libwebsocket (0.1.5)
addressable
@@ -146,8 +146,8 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.1)
- mime-types (1.20.1)
- multi_json (1.5.0)
+ mime-types (1.21)
+ multi_json (1.6.0)
multi_xml (0.5.1)
mysql2 (0.3.11)
newrelic_rpm (3.4.1)
@@ -166,34 +166,34 @@ GEM
slop (~> 3.4)
quiet_assets (1.0.1)
railties (~> 3.1)
- rack (1.4.4)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.11)
- actionmailer (= 3.2.11)
- actionpack (= 3.2.11)
- activerecord (= 3.2.11)
- activeresource (= 3.2.11)
- activesupport (= 3.2.11)
+ rails (3.2.12)
+ actionmailer (= 3.2.12)
+ actionpack (= 3.2.12)
+ activerecord (= 3.2.12)
+ activeresource (= 3.2.12)
+ activesupport (= 3.2.12)
bundler (~> 1.0)
- railties (= 3.2.11)
+ railties (= 3.2.12)
rails-footnotes (3.7.8)
rails (>= 3.0.0)
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
+ railties (3.2.12)
+ actionpack (= 3.2.12)
+ activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
rake (10.0.3)
rb-fsevent (0.9.1)
- rdoc (3.12)
+ rdoc (3.12.1)
json (~> 1.4)
redcarpet (2.1.1)
rspec-core (2.12.2)
@@ -283,7 +283,7 @@ DEPENDENCIES
newrelic_rpm
paperclip
quiet_assets
- rails (= 3.2.11)
+ rails (= 3.2.12)
rails-footnotes
rb-fsevent (~> 0.9.1)
redcarpet
@@ -1,13 +1,6 @@
# -*- encoding : utf-8 -*-
class SourceFile < ActiveRecord::Base
- belongs_to :user
- #has_attachment :storage => Alonetone.storage,
- # :content_type => ['audio/x-aiff','audio/x-wav','application/zip'],
- # :max_size => 400.megabytes,
- # :path_prefix => File.join(Alonetone.path_prefix, "source_files"),
- # :s3_access => :authenticated_read,
- # :processor => Alonetone.image_processor
-
+ belongs_to :user
end
@@ -8,7 +8,8 @@ development: &defaults
storage: local
bucket:
amazon_id:
- amazon_key:
+ amazon_key:
+ defensio:
campfire_url: nil
video_size: width="370" height="308"
enable_defensio: false

0 comments on commit ac87ed9

Please sign in to comment.