Commit 04a85f458214304b8d96a1ea052b40e171a3f2f5
1 parent
36efa204
Exists in
master
and in
4 other branches
Show wiki comments for all revisions
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
app/controllers/notes_controller.rb
| @@ -52,7 +52,7 @@ class NotesController < ApplicationController | @@ -52,7 +52,7 @@ class NotesController < ApplicationController | ||
| 52 | when "merge_request" | 52 | when "merge_request" |
| 53 | then project.merge_requests.find(params[:target_id]).notes.inc_author.order("created_at DESC").limit(20) | 53 | then project.merge_requests.find(params[:target_id]).notes.inc_author.order("created_at DESC").limit(20) |
| 54 | when "wiki" | 54 | when "wiki" |
| 55 | - then project.wikis.find(params[:target_id]).notes.order("created_at DESC").limit(20) | 55 | + then project.wikis.reverse.map {|w| w.notes.fresh }.flatten[0..20] |
| 56 | end | 56 | end |
| 57 | 57 | ||
| 58 | @notes = if params[:last_id] | 58 | @notes = if params[:last_id] |