From: Tom Hughes <tom@compton.nu>
Date: Wed, 5 Sep 2018 17:41:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1972'
X-Git-Tag: live~3934
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a0dc300840c236d6460c0641f8a9f47246815ad1?ds=inline;hp=-c

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

a0dc300840c236d6460c0641f8a9f47246815ad1
diff --combined config/routes.rb
index ed12cdf92,2cf18e334..16c05fea5
--- a/config/routes.rb
+++ b/config/routes.rb
@@@ -208,8 -208,10 +208,8 @@@ OpenStreetMap::Application.routes.draw 
    get "/traces/mine/tag/:tag" => "traces#mine"
    get "/traces/mine/page/:page" => "traces#mine"
    get "/traces/mine" => "traces#mine"
 -  post "/trace/create" => "traces#create" # remove after deployment
    get "/trace/create", :to => redirect(:path => "/traces/new")
    get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data"
 -  post "trace/:id/edit" => "traces#update" # remove after deployment
    get "/trace/:id/edit", :to => redirect(:path => "/traces/%{id}/edit")
    post "/trace/:id/delete" => "traces#delete", :id => /\d+/
  
@@@ -234,7 -236,7 +234,7 @@@
    post "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/
  
    # user pages
-   get "/user/:display_name" => "user#view", :as => "user"
+   get "/user/:display_name" => "user#show", :as => "user"
    match "/user/:display_name/make_friend" => "user#make_friend", :via => [:get, :post], :as => "make_friend"
    match "/user/:display_name/remove_friend" => "user#remove_friend", :via => [:get, :post], :as => "remove_friend"
    match "/user/:display_name/account" => "user#account", :via => [:get, :post]