diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-07-18 21:26:30 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-07-18 21:26:30 +0000 |
| commit | ec31b616982f137abdee8d0c6aa9dc4a6d103189 (patch) | |
| tree | e4f5dc564be2b4ce5047a1f5acb2790fdc3b70ca /app/views/issues | |
| parent | 1db54e228d98d20536133bf52a8af0ce67616dc3 (diff) | |
| download | redmine-ec31b616982f137abdee8d0c6aa9dc4a6d103189.tar.gz redmine-ec31b616982f137abdee8d0c6aa9dc4a6d103189.zip | |
Removes calls to #assert_template and #assigns in functional tests.
git-svn-id: http://svn.redmine.org/redmine/trunk@15695 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_conflict.html.erb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/issues/_conflict.html.erb b/app/views/issues/_conflict.html.erb index c13ace665..ea4c35d7d 100644 --- a/app/views/issues/_conflict.html.erb +++ b/app/views/issues/_conflict.html.erb @@ -3,6 +3,7 @@ <% if @conflict_journals.present? %> <div class="conflict-details"> <% @conflict_journals.sort_by(&:id).each do |journal| %> + <div class="conflict-journal"> <p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p> <% if journal.details.any? %> <ul class="details"> @@ -14,6 +15,7 @@ <div class="wiki"> <%= textilizable(journal, :notes) unless journal.notes.blank? %> </div> + </div> <% end %> </div> <% end %> |