dont render discussion diff unless note is for diff

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-06-25 10:14:35 +03:00
parent f91f230cec
commit 907548a0fb
No known key found for this signature in database
GPG Key ID: 627C5F589F467F17
2 changed files with 4 additions and 0 deletions

View File

@ -86,6 +86,8 @@ class Projects::NotesController < Projects::ApplicationController
end
def note_to_discussion_with_diff_html(note)
return unless note.for_diff_line?
render_to_string(
"projects/notes/_discussion",
layout: false,

View File

@ -183,6 +183,8 @@ class Note < ActiveRecord::Base
# If exists - its active discussion
# If not - its outdated diff
def active?
return true unless self.diff
noteable.diffs.each do |mr_diff|
next unless mr_diff.new_path == self.diff.new_path