nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
ilya 2010-07-23 11:59:31 -07:00
commit a52adba95b
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/publics_controller.rb
View file

@ -20,7 +20,7 @@ class PublicsController < ApplicationController
def hubbub def hubbub
if params['hub.mode'] == 'subscribe' || params['hub.mode'] == 'unsubscribe' if params['hub.mode'] == 'subscribe' || params['hub.mode'] == 'unsubscribe'
render :text => params['hub.challenge'], :status => 202 render :text => params['hub.challenge'], :status => 202, :layout => false
else else
Diaspora::OStatusParser::process(request.body.read) Diaspora::OStatusParser::process(request.body.read)
end end

14
config/sprinkle/provision.rb
View file

@ -35,13 +35,13 @@ require "#{File.dirname(__FILE__)}/packages/ruby"
policy :diaspora, :roles => [:tom, :backer] do policy :diaspora, :roles => [:tom, :backer] do
# requires :clean_dreamhost # requires :clean_dreamhost
# requires :tools requires :tools
# requires :rubygems requires :rubygems
# requires :bundler requires :bundler
# requires :diaspora_dependencies requires :diaspora_dependencies
# requires :database requires :database
# requires :webserver requires :webserver
# requires :scm requires :scm
requires :vim requires :vim
end end
=begin =begin