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, 14 insertions, 3 deletions

diff --git a/Gemfile b/Gemfile
index e0eee167a..6a4e2a368 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,8 @@
 source 'http://rubygems.org'
 
 gem 'mysql2', '0.2.6'
+#gem 'pg'
+#gem 'sqlite3'
 gem 'rails', '3.0.3'
 gem 'foreigner', '0.9.1'
 
@@ -11,6 +13,8 @@ gem 'ohai', '0.5.8', :require => false #Chef dependency
 gem 'nokogiri'
 gem 'settingslogic', '2.0.6'
 
+gem 'vanna', :git => "git://github.com/MikeSofaer/vanna.git"
+
 #Security
 gem 'devise', '~> 1.3.1'
 gem 'devise_invitable', '0.5.0'
@@ -22,6 +26,9 @@ gem 'twitter', '1.5.0'
 gem 'oauth2-provider', '~> 0.0.0'
 gem 'jwt', :git => "https://github.com/zhitomirskiyi/ruby-jwt", :require => false
 
+#Web
+gem 'faraday'
+gem 'faraday-stack'
 
 #Views
 gem 'haml', '3.0.25'
@@ -66,6 +73,7 @@ gem 'resque', '1.10.0'
 gem 'SystemTimer', '1.2.1' unless RUBY_VERSION.include? '1.9' || RUBY_PLATFORM =~ 'win32'
 
 group :development do
+  gem 'yard'
   gem 'capistrano', '2.5.19', :require => false
   gem 'capistrano-ext', '1.2.1', :require => false
   gem 'sod', :git => "git://github.com/MikeSofaer/sod.git", :require => false
@@ -75,7 +83,10 @@ group :test, :development do
   gem 'factory_girl_rails', :require => false
   gem 'ruby-debug-base19', '0.11.23' if RUBY_VERSION.include? '1.9.1'
   gem 'ruby-debug19' if RUBY_VERSION.include? '1.9'
-  gem 'ruby-debug' if defined?(Rubinius).nil? && RUBY_VERSION.include?('1.8')
+  if defined?(Rubinius).nil? && RUBY_VERSION.include?('1.8')
+    gem 'ruby-debug'
+    gem 'linecache', '0.43'
+  end
   gem 'launchy'
   gem 'jasmine', '1.0.2.1'
 end
@@ -83,7 +94,7 @@ end
 group :test do
   gem 'factory_girl_rails'
   gem 'fixture_builder', '~> 0.2.0'
-  gem 'selenium-webdriver', '0.1.3'
+  gem 'selenium-webdriver', '0.2.2'
   gem 'capybara', '~> 0.3.9'
   gem 'cucumber-rails', '0.3.2'
   gem 'rspec', '>= 2.0.0'
@@ -97,5 +108,5 @@ group :test do
   gem 'fuubar'
 
   gem 'diaspora-client', :path => "~/workspace/diaspora-client" #:git => 'git@github.com:diaspora/diaspora-client.git'
-                        
+
 end