From 907548a0fbf3c048536c2012bdbdbd10b604c067 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 25 Jun 2014 10:14:35 +0300 Subject: [PATCH] dont render discussion diff unless note is for diff Signed-off-by: Dmitriy Zaporozhets --- app/controllers/projects/notes_controller.rb | 2 ++ app/models/note.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index fca4c2f652..66cc1a3dec 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -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, diff --git a/app/models/note.rb b/app/models/note.rb index 590fd338fd..94d45aa43d 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -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