Merge remote-tracking branch 'origin/develop' into admin-tests-base

packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js

@@ -42,9 +42,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 		mentionIds = [];
 		highlightsIds = [];
 		toAll = false;
-		console.time('notifyUsersOnMessage');
 		highlights = RocketChat.models.Users.findUsersByUsernamesWithHighlights(room.usernames, { fields: { '_id': 1, 'settings.preferences.highlights': 1 }}).fetch();
-		console.timeEnd('notifyUsersOnMessage');
 
 		if (message.mentions != null) {
 			message.mentions.forEach(function(mention) {

packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js

@@ -94,9 +94,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 	userIdsToPushNotify = [];
 	usersWithHighlights = [];
 
-	console.time('sendNotificationOnMessage');
 	highlights = RocketChat.models.Users.findUsersByUsernamesWithHighlights(room.usernames, { fields: { '_id': 1, 'settings.preferences.highlights': 1 }}).fetch();
-	console.timeEnd('sendNotificationOnMessage');
 
 	highlights.forEach(function(user) {
 		if (messageContainsHighlight(message, user.settings.preferences.highlights)) {