Skip to content
Extraits de code Groupes Projets
Valider 63ed6a3a rédigé par maxwell's avatar maxwell
Parcourir les fichiers

MS DG made async webfingering controller. need to call it from javascript to...

MS DG made async webfingering controller.  need to call it from javascript to prevent seeds from blocking.  remember to update your gems
parent dc0bd363
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -38,6 +38,10 @@ gem 'magent', :git => 'http://github.com/dcu/magent.git' ...@@ -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 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
gem 'mini_magick' gem 'mini_magick'
#sinatra
gem 'sinatra', '1.0'
gem 'async_sinatra'
group :test, :development do group :test, :development do
gem 'factory_girl_rails' gem 'factory_girl_rails'
end end
......
...@@ -104,6 +104,8 @@ GEM ...@@ -104,6 +104,8 @@ GEM
addressable (2.2.1) addressable (2.2.1)
arel (1.0.1) arel (1.0.1)
activesupport (~> 3.0.0) activesupport (~> 3.0.0)
async_sinatra (0.2.3)
sinatra (>= 1.0)
autotest (4.3.2) autotest (4.3.2)
bcrypt-ruby (2.1.2) bcrypt-ruby (2.1.2)
bson (1.0.7) bson (1.0.7)
...@@ -212,6 +214,8 @@ GEM ...@@ -212,6 +214,8 @@ GEM
selenium-client (1.2.18) selenium-client (1.2.18)
selenium-rc (2.2.4) selenium-rc (2.2.4)
selenium-client (>= 1.2.18) selenium-client (>= 1.2.18)
sinatra (1.0)
rack (>= 1.0)
subexec (0.0.4) subexec (0.0.4)
thin (1.2.7) thin (1.2.7)
daemons (>= 1.0.9) daemons (>= 1.0.9)
...@@ -238,6 +242,7 @@ PLATFORMS ...@@ -238,6 +242,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
addressable addressable
async_sinatra
autotest autotest
bson (= 1.0.7) bson (= 1.0.7)
bson_ext (= 1.0.7) bson_ext (= 1.0.7)
...@@ -266,6 +271,7 @@ DEPENDENCIES ...@@ -266,6 +271,7 @@ DEPENDENCIES
ruby-debug ruby-debug
saucelabs-adapter (= 0.8.12) saucelabs-adapter (= 0.8.12)
selenium-rc selenium-rc
sinatra (= 1.0)
sprinkle! sprinkle!
thin thin
webmock webmock
......
...@@ -42,6 +42,9 @@ class RequestsController < ApplicationController ...@@ -42,6 +42,9 @@ class RequestsController < ApplicationController
return return
end end
# rel_hash = {:friend => params[:friend_handle]}
Rails.logger.debug("Sending request: #{rel_hash}") Rails.logger.debug("Sending request: #{rel_hash}")
begin begin
......
...@@ -33,6 +33,7 @@ Diaspora::Application.routes.draw do ...@@ -33,6 +33,7 @@ Diaspora::Application.routes.draw do
match 'signup', :to => 'registrations#new', :as => "new_user_registration" match 'signup', :to => 'registrations#new', :as => "new_user_registration"
match 'get_to_the_choppa', :to => redirect("/signup") match 'get_to_the_choppa', :to => redirect("/signup")
match "/finger", :to => AsyncController
#public routes #public routes
# #
match 'webfinger', :to => 'publics#webfinger' match 'webfinger', :to => 'publics#webfinger'
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter