Merge branch 'master' into patch/view_migration

[rails.git] / app / views / diary_entries / show.html.erb

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index cc761b15d3b03829997cd75a92d14a8238d804ae..1cc1e1c5363212c303fd8eb6aefdb4c51d1f0b92 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -6,7 +6,7 @@
   </div>
 <% end %>
 
-<%= render :partial => "diary_entry", :object => @entry %>
+<%= render @entry %>
 
 <a id="comments"></a>
 <div class='comments'>