##// END OF EJS Templates
jro_apps » redmine
RSS
replace tabs to spaces at app/views/issues/_conflict.html.erb...
Toshi MARUYAMA -
r8671:e0b0f1315bb4
parent child
Show More
Side by Side Unified
Context file:
r8671:e0b0f1315bb4 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,19 +1,19
1 1 <div class="conflict">
2 <%= l(:notice_issue_update_conflict) %>
2 <%= l(:notice_issue_update_conflict) %>
3 3 <% if @conflict_journals.present? %>
4 <div class="conflict-details">
4 <div class="conflict-details">
5 5 <% @conflict_journals.sort_by(&:id).each do |journal| %>
6 <p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p>
7 <% if journal.details.any? %>
8 <ul class="details">
9 <% details_to_strings(journal.details).each do |string| %>
10 <li><%= string %></li>
11 <% end %>
12 </ul>
13 <% end %>
14 <%= textilizable(journal, :notes) unless journal.notes.blank? %>
6 <p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p>
7 <% if journal.details.any? %>
8 <ul class="details">
9 <% details_to_strings(journal.details).each do |string| %>
10 <li><%= string %></li>
11 <% end %>
12 </ul>
13 <% end %>
14 <%= textilizable(journal, :notes) unless journal.notes.blank? %>
15 15 <% end %>
16 </div>
16 </div>
17 17 <% end %>
18 18 </div>
19 19 <p>
@@ -21,6 +21,6
21 21 <% if @notes.present? %>
22 22 <label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br />
23 23 <% end %>
24 <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)) %></label>
24 <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)) %></label>
25 25 </p>
26 26 <p><%= submit_tag l(:button_submit) %></p>
General Comments 0
You need to be logged in to leave comments. Login now