Commit 181e1309 authored by tmaruyama's avatar tmaruyama

replace tabs to spaces at app/views/issues/_conflict.html.erb

git-svn-id: https://svn.redmine.org/redmine/trunk@8791 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 785e0fc8
<div class="conflict">
<%= l(:notice_issue_update_conflict) %>
<%= l(:notice_issue_update_conflict) %>
<% if @conflict_journals.present? %>
<div class="conflict-details">
<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? %>
<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>
</div>
<% end %>
</div>
<p>
......@@ -21,6 +21,6 @@
<% 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>
<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>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment