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

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 16c05fea5f1a852ed5b6b9622e9149558a382399..579dced162150f35de09c88c03bb2a9c5e07fc29 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -225,7 +225,7 @@ OpenStreetMap::Application.routes.draw do
   get "/user/:display_name/diary" => "diary_entry#list"
   get "/diary/:language" => "diary_entry#list"
   get "/diary" => "diary_entry#list"
-  get "/user/:display_name/diary/:id" => "diary_entry#view", :id => /\d+/, :as => :diary_entry
+  get "/user/:display_name/diary/:id" => "diary_entry#show", :id => /\d+/, :as => :diary_entry
   post "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :id => /\d+/
   match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/
   post "/user/:display_name/diary/:id/hide" => "diary_entry#hide", :id => /\d+/, :as => :hide_diary_entry