From 2858118f917f0ca50c8f8ba7b931c9bdd7da84e9 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 13 Nov 2018 12:47:49 +0530
Subject: [PATCH 1/4] fix(chat): Setup and render chat on website pages as well

---
 frappe/website/js/website.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js
index 5744ebd977..7fa29991d0 100644
--- a/frappe/website/js/website.js
+++ b/frappe/website/js/website.js
@@ -421,7 +421,9 @@ frappe.ready(function() {
 		callback: (r) => {
 			if (r.message) {
 				frappe.require('/assets/js/moment-bundle.min.js', () => {
-					frappe.require('/assets/js/chat.js');
+					frappe.require('/assets/js/chat.js', () => {
+						frappe.chat.setup();
+					});
 				});
 			}
 		}

From 265d4501c6c7f0739d0dc274e2cc594f8b8be7bb Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Mon, 12 Nov 2018 22:41:11 +0530
Subject: [PATCH 2/4] fix(chat): Do not remove Chat Operators from Website
 Settings

---
 frappe/chat/doctype/chat_room/chat_room.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/chat/doctype/chat_room/chat_room.py b/frappe/chat/doctype/chat_room/chat_room.py
index b6a9ee6e5c..4de234f89b 100644
--- a/frappe/chat/doctype/chat_room/chat_room.py
+++ b/frappe/chat/doctype/chat_room/chat_room.py
@@ -195,7 +195,10 @@ def create(kind, owner, users = None, name = None):
 
 		for user in dsettings.chat_operators:
 			if user.user not in users:
-				room.append('users', user)
+				# appending user to room.users will remove the user from chat_operators
+				# this is undesirable, create a new Chat Room User instead
+				chat_room_user = {"doctype": "Chat Room User", "user": user.user}
+				room.append('users', chat_room_user)
 
 	room.save(ignore_permissions = True)
 

From a7613c174ed5d5d1bb34be062c913ec71fa4cc43 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 14 Nov 2018 20:30:54 +0530
Subject: [PATCH 3/4] fix: Fail bench build in CI environment

---
 rollup/build.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rollup/build.js b/rollup/build.js
index 8f1169838d..46c0630b0e 100644
--- a/rollup/build.js
+++ b/rollup/build.js
@@ -63,7 +63,13 @@ function build_assets(app) {
 function build(inputOptions, outputOptions) {
 	return rollup.rollup(inputOptions)
 		.then(bundle => bundle.write(outputOptions))
-		.catch(err => log(chalk.red(err)));
+		.catch(err => {
+			log(chalk.red(err));
+			// Kill process to fail in a CI environment
+			if (process.env.CI) {
+				process.kill(process.pid)
+			}
+		});
 }
 
 function concatenate_files() {

From 224603148dbff36b87fe50d1d7d1fadf9140e70e Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Thu, 15 Nov 2018 09:16:23 +0000
Subject: [PATCH 4/4] bumped to version 11.0.3-beta.27

---
 frappe/hooks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/hooks.py b/frappe/hooks.py
index b6129c7465..edd2a4f410 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.26'
+staging_version = '11.0.3-beta.27'
 
 app_email = "info@frappe.io"