Commit 04a85f45 authored by Ian Morgan's avatar Ian Morgan

Show wiki comments for all revisions

parent 36efa204
...@@ -52,7 +52,7 @@ class NotesController < ApplicationController ...@@ -52,7 +52,7 @@ class NotesController < ApplicationController
when "merge_request" when "merge_request"
then project.merge_requests.find(params[:target_id]).notes.inc_author.order("created_at DESC").limit(20) then project.merge_requests.find(params[:target_id]).notes.inc_author.order("created_at DESC").limit(20)
when "wiki" when "wiki"
then project.wikis.find(params[:target_id]).notes.order("created_at DESC").limit(20) then project.wikis.reverse.map {|w| w.notes.fresh }.flatten[0..20]
end end
@notes = if params[:last_id] @notes = if params[:last_id]
......
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