Develop sync (#10505)

* add redhat dockerfile to master (#10408)

* add redhat dockerfile to master

* Add redhat dockerfile to set-version helper script

* Release 0.63.2 (#10476)

* [FIX] Even TypeErrors with SAML (#10475)

* Bump version to 0.63.2

* Added one2mail.info to default blocked domain list (#10218)

* [FIX] The 'channel.messages' REST API Endpoint error (#10485)

* Bump version to 0.63.3

* Add the history of v0.63.3

* Fix the failed auto-merge of history.md file

.docker/Dockerfile.rhel

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

.github/history.json

@@ -12225,5 +12225,44 @@
         "geekgonecrazy"
       ]
     }
+  ],
+  "0.63.3": [
+    {
+      "pr": "10485",
+      "title": "[FIX] The 'channel.messages' REST API Endpoint error",
+      "userLogin": "rafaelks",
+      "milestone": "0.64.0",
+      "contributors": [
+        "rafaelks",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10218",
+      "title": "Added one2mail.info to default blocked domains list",
+      "userLogin": "nsuchy",
+      "milestone": "0.64.0",
+      "contributors": [
+        "nsuchy",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10476",
+      "title": "Release 0.63.2",
+      "userLogin": "graywolf336",
+      "contributors": [
+        "graywolf336",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10475",
+      "title": "[FIX] Even TypeErrors with SAML",
+      "userLogin": "graywolf336",
+      "contributors": [
+        "graywolf336"
+      ]
+    }
   ]
-}
+}

HISTORY.md

@@ -2,7 +2,25 @@
 # 0.64.0-develop (2018-04-07)
 
 
+# 0.63.3
+`2018-04-18  ·  2 🐛  ·  2 🔍  ·  1 👩‍💻👨‍💻`
 
+### 🐛 Bug fixes
+
+- The 'channel.messages' REST API Endpoint error ([#10485](https://github.com/RocketChat/Rocket.Chat/pull/10485))
+- Even TypeErrors with SAML ([#10475](https://github.com/RocketChat/Rocket.Chat/pull/10475))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Added one2mail.info to default blocked domains list ([#10218](https://github.com/RocketChat/Rocket.Chat/pull/10218) by [@nsuchy](https://github.com/nsuchy))
+- Release 0.63.2 ([#10476](https://github.com/RocketChat/Rocket.Chat/pull/10476))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@nsuchy](https://github.com/nsuchy)
 
 # 0.63.2
 `2018-04-17  ·  1 🐛  ·  1 🔍`
@@ -1939,4 +1957,4 @@
 - [@qge](https://github.com/qge)
 - [@sezinkarli](https://github.com/sezinkarli)
 - [@szluohua](https://github.com/szluohua)
-- [@tgxn](https://github.com/tgxn)
+- [@tgxn](https://github.com/tgxn)

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

@@ -586,6 +586,7 @@ RocketChat.emailDomainDefaultBlackList = [
 	'one-time.email',
 	'oneoffemail.com',
 	'oneoffmail.com',
+	'one2mail.info',
 	'onewaymail.com',
 	'onlatedotcom.info',
 	'online.ms',