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

MS found one more duplicate in the Gemfile

parent f483c2f6
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
class DashboardsController < ApplicationController class DashboardsController < ApplicationController
before_filter :authenticate_user!
before_filter :authenticate_user!, :except => :receive
include ApplicationHelper include ApplicationHelper
def index def index
@posts = Post.paginate :page => params[:page], :order => 'created_at DESC' @posts = Post.paginate :page => params[:page], :order => 'created_at DESC'
end end
def receive
puts "SOMEONE JUST SENT ME: #{params[:xml]}"
store_objects_from_xml params[:xml]
render :nothing => true
end
def warzombie def warzombie
render :nothing => true render :nothing => true
......
...@@ -22,4 +22,11 @@ class PublicsController < ApplicationController ...@@ -22,4 +22,11 @@ class PublicsController < ApplicationController
render :text => params['hub.challenge'], :status => 202 render :text => params['hub.challenge'], :status => 202
end end
end end
def receive
puts "SOMEONE JUST SENT ME: #{params[:xml]}"
store_objects_from_xml params[:xml]
render :nothing => true
end
end end
...@@ -20,14 +20,16 @@ Diaspora::Application.routes.draw do |map| ...@@ -20,14 +20,16 @@ Diaspora::Application.routes.draw do |map|
match 'login', :to => 'devise/sessions#new', :as => "new_user_session" match 'login', :to => 'devise/sessions#new', :as => "new_user_session"
match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session" match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session"
#match 'signup', :to => 'devise/registrations#new', :as => "new_user_registration" #match 'signup', :to => 'devise/registrations#new', :as => "new_user_registration"
resources :users resources :users
match 'receive', :to => 'dashboards#receive'
match 'hubbub', :to => 'publics#hubbub'
match '.well-known/host-meta', :to => 'publics#host_meta' #public routes
match 'webfinger', :to => 'publics#webfinger' match 'receive', :to => 'publics#receive'
match 'hcard', :to => 'publics#hcard' match 'hubbub', :to => 'publics#hubbub'
match '.well-known/host-meta',:to => 'publics#host_meta'
match 'webfinger', :to => 'publics#webfinger'
match 'hcard', :to => 'publics#hcard'
#root
root :to => 'dashboards#index' root :to => 'dashboards#index'
end end
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