MS DG made async webfingering controller. need to call it from javascript to prevent seeds from blocking. remember to update your gems
This commit is contained in:
parent
dc0bd363a1
commit
63ed6a3a95
4 changed files with 14 additions and 0 deletions
4
Gemfile
4
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -42,6 +42,9 @@ class RequestsController < ApplicationController
|
|||
return
|
||||
end
|
||||
|
||||
|
||||
|
||||
# rel_hash = {:friend => params[:friend_handle]}
|
||||
Rails.logger.debug("Sending request: #{rel_hash}")
|
||||
|
||||
begin
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
Loading…
Reference in a new issue