Merge branch 'master' of github.com:r888888888/danbooru

This commit is contained in:
albert
2013-03-28 11:42:22 -04:00

View File

@@ -13,7 +13,7 @@
<% elsif @upload.is_processing? %>
<p>This upload is being processed. Please wait a few seconds.</p>
<% elsif @upload.is_duplicate? %>
<p>This upload is a duplicate: post #<%= link_to @upload.duplicate_post_id, post_path(@upload.duplicate_post_id) %></p>
<p>This upload is a duplicate: <%= link_to "post ##{@upload.duplicate_post_id}", post_path(@upload.duplicate_post_id) %></p>
<% else %>
<p>An error occurred: <%= @upload.status %></p>
<ul>