From 6fe1a69e8e325b40d3734027b5f7798bd77320ea Mon Sep 17 00:00:00 2001 From: Toks Date: Fri, 30 Oct 2015 12:19:35 -0400 Subject: [PATCH] Don't merge note versions on deletion --- app/models/note.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/note.rb b/app/models/note.rb index 81bba616b..b001b2676 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -200,7 +200,7 @@ class Note < ActiveRecord::Base def merge_version? prev = versions.last - prev && prev.updater_id == CurrentUser.user.id && prev.updated_at > 1.hour.ago + prev && prev.updater_id == CurrentUser.user.id && prev.updated_at > 1.hour.ago && !is_active_changed? end def revert_to(version)