Merge remote-tracking branch 'upstream/pull/5510'

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 1e240217ce1cfe024b882a26ccde324f8fd7fbf6..9e82a037dafea8d95c3c25a6ee4597ea1e6a888d 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -289,8 +289,12 @@ OpenStreetMap::Application.routes.draw do
   resource :profile, :only => [:edit, :update]
 
   # friendships
   resource :profile, :only => [:edit, :update]
 
   # friendships

-  match "/user/:display_name/make_friend" => "friendships#make_friend", :via => [:get, :post], :as => "make_friend"
-  match "/user/:display_name/remove_friend" => "friendships#remove_friend", :via => [:get, :post], :as => "remove_friend"
+  scope "/user/:display_name" do
+    resource :follow, :only => [:create, :destroy, :show], :path => "follow"
+
+    get "make_friend", :to => redirect("/user/%{display_name}/follow")
+    get "remove_friend", :to => redirect("/user/%{display_name}/follow")
+  end

 
   # user lists
   namespace :users do
 
   # user lists
   namespace :users do