Merge branch 'develop' into rocketlets

packages/rocketchat-api/server/api.js

@@ -360,7 +360,7 @@ const createApi = function _createApi(enableCors) {
 		RocketChat.API.v1 = new API({
 			version: 'v1',
 			useDefaultAuth: true,
-			prettyJson: true,
+			prettyJson: process.env.NODE_ENV === 'development',
 			enableCors,
 			auth: getUserAuth()
 		});
@@ -369,7 +369,7 @@ const createApi = function _createApi(enableCors) {
 	if (!RocketChat.API.default || RocketChat.API.default._config.enableCors !== enableCors) {
 		RocketChat.API.default = new API({
 			useDefaultAuth: true,
-			prettyJson: true,
+			prettyJson: process.env.NODE_ENV === 'development',
 			enableCors,
 			auth: getUserAuth()
 		});

packages/rocketchat-channel-settings/client/views/channelSettings.js

@@ -366,13 +366,13 @@ Template.channelSettings.onCreated(function() {
 			},
 			save(value, room) {
 				this.processing.set(true);
-				return Meteor.call('saveRoomSettings', room._id, 'reactWhenReadOnly', value, (err) => {
+				Meteor.call('saveRoomSettings', room._id, 'reactWhenReadOnly', value, (err) => {
 					if (err) {
 						return handleError(err);
 					}
 
 					this.processing.set(false);
-					return toastr.success(TAPi18n.__('React_when_read_only_changed_successfully'));
+					toastr.success(TAPi18n.__('React_when_read_only_changed_successfully'));
 				});
 			}
 		},

server/publications/room.js

@@ -30,6 +30,7 @@ const fields = {
 	v: 1,
 	label: 1,
 	ro: 1,
+	reactWhenReadOnly: 1,
 	sentiment: 1,
 	tokenpass: 1
 };