Merge branch 'master' into oauth

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb

1 files changed, 25 insertions, 10 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index c5dbe5c73..beb878e24 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,6 +15,14 @@ GIT
       net-scp
 
 GIT
+  remote: git://github.com/MikeSofaer/vanna.git
+  revision: 334eec220dbfddcc6bd3108e6e6c77fec8484dc4
+  specs:
+    vanna (0.1.1)
+      json
+      rails (>= 3.0.0)
+
+GIT
   remote: git://github.com/diaspora/acts-as-taggable-on.git
   revision: c3592fe1a906f6ff1cd12766c5cf1152c51eec40
   specs:
@@ -131,8 +139,8 @@ GEM
       ohai (>= 0.5.7)
       rest-client (< 1.7.0, >= 1.0.4)
       uuidtools
-    childprocess (0.1.7)
-      ffi (~> 0.6.3)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
     closure-compiler (1.1.1)
     cloudfiles (1.4.10)
       mime-types (>= 1.16)
@@ -171,12 +179,13 @@ GEM
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
+    faraday-stack (0.1.2)
+      faraday (~> 0.6)
     faraday_middleware (0.6.3)
       faraday (~> 0.6.0)
     fastercsv (1.5.4)
     fastthread (1.0.7)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
+    ffi (1.0.9)
     fixture_builder (0.2.2)
     fog (0.3.25)
       builder
@@ -216,7 +225,7 @@ GEM
       rspec (>= 1.3.1)
       selenium-webdriver (>= 0.1.3)
     json (1.4.6)
-    json_pure (1.5.1)
+    json_pure (1.5.3)
     launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
@@ -326,7 +335,7 @@ GEM
       activesupport (= 3.0.3)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.9.1)
+    rake (0.9.2)
     rash (0.3.0)
       hashie (~> 1.0.0)
     rcov (0.9.9)
@@ -366,9 +375,9 @@ GEM
     ruby-progressbar (0.0.10)
     rubyntlm (0.1.1)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.3)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
+      ffi (>= 1.0.7)
       json_pure
       rubyzip
     settingslogic (2.0.6)
@@ -409,6 +418,7 @@ GEM
       crack (>= 0.1.7)
     will_paginate (3.0.pre2)
     xml-simple (1.0.16)
+    yard (0.7.1)
     yui-compressor (0.9.6)
       POpen4 (>= 0.1.4)
 
@@ -435,6 +445,8 @@ DEPENDENCIES
   em-websocket!
   excon (= 0.2.4)
   factory_girl_rails
+  faraday
+  faraday-stack
   fastercsv (= 1.5.4)
   fixture_builder (~> 0.2.0)
   fog (= 0.3.25)
@@ -448,6 +460,7 @@ DEPENDENCIES
   json (= 1.4.6)
   jwt!
   launchy
+  linecache (= 0.43)
   mini_magick (= 3.2)
   mongrel
   mysql2 (= 0.2.6)
@@ -466,11 +479,13 @@ DEPENDENCIES
   rspec-instafail (>= 0.1.7)
   rspec-rails (>= 2.0.0)
   ruby-debug
-  selenium-webdriver (= 0.1.3)
+  selenium-webdriver (= 0.2.2)
   settingslogic (= 2.0.6)
   sod!
   thin (= 1.2.11)
   twitter (= 1.5.0)
   typhoeus
+  vanna!
   webmock
   will_paginate (= 3.0.pre2)
+  yard