##// END OF EJS Templates
jro_apps » redmine
RSS
scm: git: skip Latin-1 path tests on Git for Windows above 1.7.10...
scm: git: skip Latin-1 path tests on Git for Windows above 1.7.10 Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10. http://code.google.com/p/msysgit/issues/detail?id=80 So, Latin-1 path tests fail on Japanese Windows git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9750 e93f8b46-1217-0410-a6f0-8f06a7374b81
Toshi MARUYAMA - - Load All Authors

File last commit:

r8671:e0b0f1315bb4
r9567:ba25d27e3ade
Show More
_conflict.html.erb
26 lines | 1.1 KiB | text/plain | TextLexer
/ app / views / issues / _conflict.html.erb
History | Annotation | Raw |Copy content |Copy permalink
<div class="conflict">
<%= l(:notice_issue_update_conflict) %>
<% if @conflict_journals.present? %>
<div class="conflict-details">
<% @conflict_journals.sort_by(&:id).each do |journal| %>
<p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p>
<% if journal.details.any? %>
<ul class="details">
<% details_to_strings(journal.details).each do |string| %>
<li><%= string %></li>
<% end %>
</ul>
<% end %>
<%= textilizable(journal, :notes) unless journal.notes.blank? %>
<% end %>
</div>
<% end %>
</div>
<p>
<label><%= radio_button_tag 'conflict_resolution', 'overwrite' %> <%= l(:text_issue_conflict_resolution_overwrite) %></label><br />
<% if @notes.present? %>
<label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br />
<% end %>
<label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)) %></label>
</p>
<p><%= submit_tag l(:button_submit) %></p>