MS found one more duplicate in the Gemfile
This commit is contained in:
parent
f483c2f66d
commit
917d58acbb
3 changed files with 18 additions and 17 deletions
|
|
@ -1,18 +1,10 @@
|
|||
class DashboardsController < ApplicationController
|
||||
|
||||
before_filter :authenticate_user!, :except => :receive
|
||||
before_filter :authenticate_user!
|
||||
include ApplicationHelper
|
||||
|
||||
def index
|
||||
@posts = Post.paginate :page => params[:page], :order => 'created_at DESC'
|
||||
end
|
||||
|
||||
def receive
|
||||
puts "SOMEONE JUST SENT ME: #{params[:xml]}"
|
||||
store_objects_from_xml params[:xml]
|
||||
render :nothing => true
|
||||
end
|
||||
|
||||
|
||||
def warzombie
|
||||
render :nothing => true
|
||||
|
|
|
|||
|
|
@ -22,4 +22,11 @@ class PublicsController < ApplicationController
|
|||
render :text => params['hub.challenge'], :status => 202
|
||||
end
|
||||
end
|
||||
|
||||
def receive
|
||||
puts "SOMEONE JUST SENT ME: #{params[:xml]}"
|
||||
store_objects_from_xml params[:xml]
|
||||
render :nothing => true
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -20,14 +20,16 @@ Diaspora::Application.routes.draw do |map|
|
|||
match 'login', :to => 'devise/sessions#new', :as => "new_user_session"
|
||||
match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session"
|
||||
#match 'signup', :to => 'devise/registrations#new', :as => "new_user_registration"
|
||||
|
||||
|
||||
resources :users
|
||||
match 'receive', :to => 'dashboards#receive'
|
||||
match 'hubbub', :to => 'publics#hubbub'
|
||||
match '.well-known/host-meta', :to => 'publics#host_meta'
|
||||
match 'webfinger', :to => 'publics#webfinger'
|
||||
match 'hcard', :to => 'publics#hcard'
|
||||
|
||||
|
||||
#public routes
|
||||
match 'receive', :to => 'publics#receive'
|
||||
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'
|
||||
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue