From 26260fc11f8a961cbdab84ba6ce68cc71f2bca64 Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Thu, 1 Jun 2017 16:33:50 +0100
Subject: [PATCH] Prevent aggregation of changes from different users.

---
 .../review-panel/controllers/ReviewPanelController.coffee  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
index 76ad8c84cb..1fbb1bd22b 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -247,7 +247,12 @@ define [
 				delete delete_changes[change.id]
 				entries[change.id] ?= {}
 				
-				if potential_aggregate and change.op.d and change.op.p == prev_insertion.op.p + prev_insertion.op.i.length
+				if (
+					potential_aggregate and 
+					change.op.d and 
+					change.op.p == prev_insertion.op.p + prev_insertion.op.i.length and
+					change.metadata.user_id == prev_insertion.metadata.user_id
+				)
 					aggregate_entry = true
 
 				new_entry = {