From 2d123a8be7ac8d4732214b13c8044fb70d382aac Mon Sep 17 00:00:00 2001
From: Bradley Hilton <graywolf336@craftyn.com>
Date: Fri, 20 Apr 2018 10:33:42 -0400
Subject: [PATCH] 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                       |  2 +-
 .github/history.json                          | 41 ++++++++++++++++++-
 HISTORY.md                                    | 20 ++++++++-
 .../server/lib/defaultBlockedDomainsList.js   |  1 +
 4 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index a342fbb619fd..935c47ff829f 100644
--- a/.docker/Dockerfile.rhel
+++ b/.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
 
diff --git a/.github/history.json b/.github/history.json
index 9a8a304445a7..f5c429911baf 100644
--- a/.github/history.json
+++ b/.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"
+      ]
+    }
   ]
-}
\ No newline at end of file
+}
diff --git a/HISTORY.md b/HISTORY.md
index 08985038c094..e4d09df6415b 100644
--- a/HISTORY.md
+++ b/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)
\ No newline at end of file
+- [@tgxn](https://github.com/tgxn)
diff --git a/packages/rocketchat-lib/server/lib/defaultBlockedDomainsList.js b/packages/rocketchat-lib/server/lib/defaultBlockedDomainsList.js
index 35e7cf29b8b0..c67721546495 100644
--- a/packages/rocketchat-lib/server/lib/defaultBlockedDomainsList.js
+++ b/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',