Release 1.1.1

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 1.1.0
+ENV RC_VERSION 1.1.1
 
 MAINTAINER buildmaster@rocket.chat
 

.github/history.json

@@ -31802,6 +31802,45 @@
           ]
         }
       ]
+    },
+    "1.1.1": {
+      "node_version": "8.11.4",
+      "npm_version": "6.4.1",
+      "mongo_versions": [
+        "3.2",
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "14686",
+          "title": "[FIX] SAML login error.",
+          "userLogin": "Hudell",
+          "milestone": "1.1.1",
+          "contributors": [
+            "Hudell"
+          ]
+        },
+        {
+          "pr": "14668",
+          "title": "[FIX] Load messages after disconnect and message box scroll missing",
+          "userLogin": "ggazzo",
+          "milestone": "1.1.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "14674",
+          "title": "Removing unnecesary federation configs",
+          "userLogin": "alansikora",
+          "milestone": "1.1.1",
+          "contributors": [
+            "alansikora"
+          ]
+        }
+      ]
     }
   }
 }

.travis/snap.sh

@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=1.1.0
+    RC_VERSION=1.1.1
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"

HISTORY.md

@@ -1,4 +1,30 @@
 
+# 1.1.1
+`2019-05-30  ·  2 🐛  ·  1 🔍  ·  3 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.4`
+- NPM: `6.4.1`
+- MongoDB: `3.2, 3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+- SAML login error. ([#14686](https://github.com/RocketChat/Rocket.Chat/pull/14686))
+- Load messages after disconnect and message box scroll missing ([#14668](https://github.com/RocketChat/Rocket.Chat/pull/14668))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Removing unnecesary federation configs ([#14674](https://github.com/RocketChat/Rocket.Chat/pull/14674))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@alansikora](https://github.com/alansikora)
+- [@ggazzo](https://github.com/ggazzo)
+
 # 1.1.0
 `2019-05-27  ·  5 🎉  ·  10 🚀  ·  52 🐛  ·  35 🔍  ·  27 👩‍💻👨‍💻`
 

app/meteor-accounts-saml/server/saml_server.js

@@ -119,14 +119,17 @@ Accounts.registerLoginHandler(function(loginRequest) {
 		const fullName = loginResult.profile.cn || loginResult.profile.username || loginResult.profile.displayName;
 
 		let eppnMatch = false;
+		let user = null;
 
 		// Check eppn
-		let user = Meteor.users.findOne({
-			eppn: eduPersonPrincipalName,
-		});
+		if (eduPersonPrincipalName) {
+			user = Meteor.users.findOne({
+				eppn: eduPersonPrincipalName,
+			});
 
-		if (user) {
-			eppnMatch = true;
+			if (user) {
+				eppnMatch = true;
+			}
 		}
 
 		// If eppn is not exist

app/ui-message/client/messageBox/messageBoxAutogrow.js

@@ -34,7 +34,7 @@ export const setupAutogrow = (textarea: HTMLTextAreaElement, shadow: HTMLDivElem
 			return true;
 		}
 
-		const shadowText =			text.replace(/</g, '&lt;')
+		const shadowText = text.replace(/</g, '&lt;')
 			.replace(/>/g, '&gt;')
 			.replace(/&/g, '&amp;')
 			.replace(/\n$/, '<br/>&nbsp;')
@@ -56,7 +56,7 @@ export const setupAutogrow = (textarea: HTMLTextAreaElement, shadow: HTMLDivElem
 
 		lastHeight = height;
 
-		const overflow = height === maxHeight ? 'hidden' : '';
+		const overflow = height < maxHeight ? 'hidden' : '';
 
 		if (height < maxHeight) {
 			textLenght = text.length;

app/ui-utils/client/lib/RoomManager.js

@@ -10,13 +10,14 @@ import { fireGlobalEvent } from './fireGlobalEvent';
 import { upsertMessage, RoomHistoryManager } from './RoomHistoryManager';
 import { mainReady } from './mainReady';
 import { roomTypes } from '../../../utils';
-import { call } from '../..';
 import { callbacks } from '../../../callbacks';
 import { Notifications } from '../../../notifications';
 import { CachedChatRoom, ChatMessage, ChatSubscription, CachedChatSubscription } from '../../../models';
 import { CachedCollectionManager } from '../../../ui-cached-collection';
 import { getConfig } from '../config';
 
+import { call } from '..';
+
 
 const maxRoomsOpen = parseInt(getConfig('maxRoomsOpen')) || 5;
 

app/utils/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "1.1.0"
+	"version": "1.1.1"
 }

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

server/startup/migrations/index.js

@@ -143,4 +143,6 @@ import './v142';
 import './v143';
 import './v144';
 import './v145';
+import './v146';
+import './v147';
 import './xrun';

server/startup/migrations/v147.js

@@ -0,0 +1,22 @@
+import { Migrations } from '../../../app/migrations/server';
+import { Settings } from '../../../app/models';
+
+const validSettings = [
+	'FEDERATION_Discovery_Method',
+	'FEDERATION_Domain',
+	'FEDERATION_Enabled',
+	'FEDERATION_Hub_URL',
+	'FEDERATION_Public_Key',
+	'FEDERATION_Status',
+	'FEDERATION_Test_Setup',
+];
+
+Migrations.add({
+	version: 147,
+	up() {
+		Settings.remove({ $and: [{ _id: /FEDERATION/ }, { _id: { $nin: validSettings } }] });
+	},
+	down() {
+		// Down migration does not apply in this case
+	},
+});