diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/issues/_changesets.html.erb | 4 | ||||
| -rw-r--r-- | app/views/repositories/_changeset.html.erb | 4 | ||||
| -rw-r--r-- | app/views/repositories/_revisions.html.erb | 2 | ||||
| -rw-r--r-- | app/views/settings/_repositories.html.erb | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/app/views/issues/_changesets.html.erb b/app/views/issues/_changesets.html.erb index f4b47c617..0e963fcf8 100644 --- a/app/views/issues/_changesets.html.erb +++ b/app/views/issues/_changesets.html.erb @@ -13,8 +13,8 @@ <% end %> <br /> <span class="author"><%= authoring(changeset.committed_on, changeset.author) %></span></p> - <div class="wiki"> - <%= textilizable(changeset, :comments) %> + <div class="wiki changset-comments"> + <%= format_changeset_comments changeset %> </div> </div> <% end %> diff --git a/app/views/repositories/_changeset.html.erb b/app/views/repositories/_changeset.html.erb index dbdf17160..e123daf86 100644 --- a/app/views/repositories/_changeset.html.erb +++ b/app/views/repositories/_changeset.html.erb @@ -33,7 +33,9 @@ </div> -<%= textilizable @changeset.comments %> +<div class="wiki changset-comments"> + <%= format_changeset_comments @changeset %> +</div> <% if @changeset.issues.visible.any? || User.current.allowed_to?(:manage_related_issues, @repository.project) %> <%= render :partial => 'related_issues' %> diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb index 9c72204fa..d1b9c4b04 100644 --- a/app/views/repositories/_revisions.html.erb +++ b/app/views/repositories/_revisions.html.erb @@ -42,7 +42,7 @@ end %> <td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('#cb-#{line_num}').prop('checked')) {$('#cb-#{line_num-1}').prop('checked',true);}") if show_diff && (line_num > 1) %></td> <td class="committed_on"><%= format_time(changeset.committed_on) %></td> <td class="author"><%= changeset.user.blank? ? changeset.author.to_s.truncate(30) : link_to_user(changeset.user) %></td> -<td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td> +<td class="comments"><%= format_changeset_comments changeset, :short => true %></td> </tr> <% line_num += 1 %> <% end %> diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb index 760903ea0..adac52fc7 100644 --- a/app/views/settings/_repositories.html.erb +++ b/app/views/settings/_repositories.html.erb @@ -52,6 +52,8 @@ </p> <p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p> + +<p><%= setting_check_box :commit_logs_formatting %></p> </div> <fieldset class="box tabular settings"> |