From 917d58acbb9869e8929d111a794a9a5e5391ab47 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Sat, 17 Jul 2010 14:10:31 -0700
Subject: [PATCH] MS found one more duplicate in the Gemfile
---
app/controllers/dashboards_controller.rb | 10 +---------
app/controllers/publics_controller.rb | 7 +++++++
config/routes.rb | 18 ++++++++++--------
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb
index 8264212a9f..b04f7b59cd 100644
--- a/app/controllers/dashboards_controller.rb
+++ b/app/controllers/dashboards_controller.rb
@@ -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
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index 454b614ff1..ed643b7368 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -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
diff --git a/config/routes.rb b/config/routes.rb
index 279d74984f..b211cc7b23 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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
--
GitLab