Fix MR diff comments. Fix wiki comments loading error
This commit is contained in:
parent
caeb65b189
commit
9159be3a50
5 changed files with 11 additions and 4 deletions
|
@ -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 @@ module Notes
|
|||
# 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 @@ class Project < ActiveRecord::Base
|
|||
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 @@ class Wiki < ActiveRecord::Base
|
|||
end
|
||||
new_wiki
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
# == Schema Information
|
||||
|
|
|
@ -1,2 +1,6 @@
|
|||
= render "show"
|
||||
|
||||
:javascript
|
||||
$(function(){
|
||||
PerLineNotes.init();
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue