Commit 9159be3a authored by randx's avatar randx
Browse files

Fix MR diff comments. Fix wiki comments loading error

parent e7a86aac1398
......@@ -14,7 +14,7 @@
border-top:1px solid #aaa;
}
#new-notes-list.reversed {
border-bottom:1px solid #aaa;
border-bottom:1px solid #ccc;
}
.issue_notes,
......@@ -227,7 +227,7 @@ td .line_note_link {
}
}
.note-text {
.note-text {
border: 1px solid #aaa;
box-shadow:none;
}
......@@ -20,7 +20,7 @@ def execute
# this is the only case, where the order is DESC
project.common_notes.order("created_at DESC, id DESC").limit(50)
when "wiki"
project.wikis.reverse.map {|w| w.notes.fresh }.flatten[0..20]
project.wiki_notes.limit(20)
end
@notes = if after_id
......
......@@ -171,6 +171,10 @@ def last_activity_date
end
end
def wiki_notes
Note.where(noteable_id: wikis.map(&:id), noteable_type: 'Wiki', project_id: self.id)
end
def project_id
self.id
end
......
......@@ -28,7 +28,6 @@ def regenerate_from wiki
end
new_wiki
end
end
end
# == Schema Information
......
= render "show"
:javascript
$(function(){
PerLineNotes.init();
});
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