Merge branch 'typhoeus'

2011-06-05 22:35:28 +02:00
parent 363826d60c 0e92f0c0ba
commit 9ad56ebe73
17 changed files with 180 additions and 83 deletions
@@ -59,6 +59,7 @@ GEM
    jquery-rails (1.0.9)
      railties (~> 3.0)
      thor (~> 0.14)
+    json (1.5.1)
    mail (2.2.19)
      activesupport (>= 2.3.6)
      i18n (>= 0.4.0)
@@ -129,6 +130,9 @@ GEM
    thor (0.14.6)
    treetop (1.4.9)
      polyglot (>= 0.3.1)
+    typhoeus (0.2.4)
+      mime-types
+      mime-types
    tzinfo (0.3.27)
    warden (1.0.4)
      rack (>= 1.0)
@@ -150,9 +154,11 @@ DEPENDENCIES
  oa-oauth
  oa-openid
  paperclip (~> 2.3)
+  json
  rails (= 3.0.5)
  rake (= 0.8.7)
  ruby_parser
  sqlite3
  sqlite3-ruby
+  typhoeus
  youtube_it