Merge branch 'master' of github.com:diaspora/diaspora

Gemfile

@@ -38,6 +38,10 @@ gem 'magent', :git => 'http://github.com/dcu/magent.git'
 gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
 gem 'mini_magick'
 
+#sinatra
+gem 'sinatra', '1.0'
+gem 'async_sinatra'
+
 group :test, :development do
   gem 'factory_girl_rails'
 end

Gemfile.lock

@@ -104,6 +104,8 @@ GEM
     addressable (2.2.1)
     arel (1.0.1)
       activesupport (~> 3.0.0)
+    async_sinatra (0.2.3)
+      sinatra (>= 1.0)
     autotest (4.3.2)
     bcrypt-ruby (2.1.2)
     bson (1.0.7)
@@ -212,6 +214,8 @@ GEM
     selenium-client (1.2.18)
     selenium-rc (2.2.4)
       selenium-client (>= 1.2.18)
+    sinatra (1.0)
+      rack (>= 1.0)
     subexec (0.0.4)
     thin (1.2.7)
       daemons (>= 1.0.9)
@@ -238,6 +242,7 @@ PLATFORMS
 
 DEPENDENCIES
   addressable
+  async_sinatra
   autotest
   bson (= 1.0.7)
   bson_ext (= 1.0.7)
@@ -266,6 +271,7 @@ DEPENDENCIES
   ruby-debug
   saucelabs-adapter (= 0.8.12)
   selenium-rc
+  sinatra (= 1.0)
   sprinkle!
   thin
   webmock

app/controllers/requests_controller.rb

@@ -42,6 +42,9 @@ class RequestsController < ApplicationController
       return
     end
 
+
+
+    # rel_hash = {:friend => params[:friend_handle]}
     Rails.logger.debug("Sending request: #{rel_hash}")
 
     begin

app/views/devise/sessions/new.html.haml

@@ -10,7 +10,7 @@
       = f.label :username
       = f.text_field :username
     %p.user_network
-      ="@#{APP_CONFIG[:pod_url]}"
+      ="@#{APP_CONFIG[:terse_pod_url]}"
 
     %p
       = f.label :password

config/routes.rb

@@ -33,6 +33,7 @@ Diaspora::Application.routes.draw do
   match 'signup', :to => 'registrations#new', :as => "new_user_registration"
 
   match 'get_to_the_choppa', :to => redirect("/signup") 
+  match "/finger", :to => AsyncController
   #public routes
   #
   match 'webfinger', :to => 'publics#webfinger'