jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #816

Browse Source
This commit is contained in:
albert
2013-03-09 12:59:09 -05:00
parent d57765a287
commit fb21db2774
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/wiki_page_versions/diff.html.erb
View File

@@ -2,7 +2,7 @@
<div id="a-diff"> <div id="a-diff">
<h1>Wiki Page: <%= @thispage.title %></h1> <h1>Wiki Page: <%= @thispage.title %></h1>
<p>Showing differences between <%= compact_time @thispage.created_at %> (<%= link_to @thispage.updater.name, user_path(@thispage.updater) %>) and <%= compact_time @otherpage.created_at %> (<%= link_to @otherpage.updater.name, user_path(@otherpage.updater) %>)</p> <p>Showing differences between <%= compact_time @thispage.created_at %> (<%= link_to @thispage.updater_name, user_path(@thispage.updater) %>) and <%= compact_time @otherpage.created_at %> (<%= link_to @otherpage.updater_name, user_path(@otherpage.updater) %>)</p>
<div> <div>
<%= wiki_page_diff(@thispage, @otherpage) %> <%= wiki_page_diff(@thispage, @otherpage) %>

2
config/environments/production.rb
View File

@@ -64,6 +64,4 @@ Danbooru::Application.configure do
# Log the query plan for queries taking more than this (works # Log the query plan for queries taking more than this (works
# with SQLite, MySQL, and PostgreSQL) # with SQLite, MySQL, and PostgreSQL)
# config.active_record.auto_explain_threshold_in_seconds = 0.5 # config.active_record.auto_explain_threshold_in_seconds = 0.5
config.action_mailer.delivery_method = :sendmail
end end