From 78123ed1088053b93e8abb0289160810bbc3b1c4 Mon Sep 17 00:00:00 2001
From: William Reiske <wreiske@mieweb.com>
Date: Sun, 28 Apr 2019 18:38:46 -0400
Subject: [PATCH 1/8] Fix file-upload url bug (#14282)

---
 app/file-upload/server/lib/requests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/file-upload/server/lib/requests.js b/app/file-upload/server/lib/requests.js
index d859e3f1a877..b0793af4b9b0 100644
--- a/app/file-upload/server/lib/requests.js
+++ b/app/file-upload/server/lib/requests.js
@@ -6,7 +6,7 @@ WebApp.connectHandlers.use('/file-upload/',	function(req, res, next) {
 
 	const match = /^\/([^\/]+)\/(.*)/.exec(req.url);
 
-	if (match[1]) {
+	if (match && match[1]) {
 		const file = Uploads.findOneById(match[1]);
 
 		if (file) {

From a7a73d904e9e92fff39b8601057dcb45baee456d Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 28 Apr 2019 20:36:43 -0300
Subject: [PATCH 2/8] Merge pull request #14290 from RocketChat/fix-apps-header

[FIX] Wrong header at Apps admin section
---
 app/apps/client/admin/apps.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/apps/client/admin/apps.html b/app/apps/client/admin/apps.html
index f716707f6c16..96f0f9b699bd 100644
--- a/app/apps/client/admin/apps.html
+++ b/app/apps/client/admin/apps.html
@@ -1,6 +1,6 @@
 <template name="apps">
 	<section class="rc-apps-marketplace">
-		{{#header sectionName="Marketplace" hideHelp=true fixedHeight=true fullpage=true}}
+		{{#header sectionName="Apps" hideHelp=true fixedHeight=true fullpage=true}}
 			<div class="rc-header__section-button">
 				<button class="rc-button rc-button--small rc-button--primary" data-button="install_app">
 					{{> icon icon="cloud-plus" block="rc-icon--default-size"}} {{_ "Marketplace_view_marketplace"}}

From b26735c4ba8509011864ee72f04fedcdcd454c2d Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 28 Apr 2019 20:36:58 -0300
Subject: [PATCH 3/8] Merge pull request #14286 from
 RocketChat/fix/emails-undefined

[FIX] Startup error in registration check
---
 app/cloud/server/functions/retrieveRegistrationStatus.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/cloud/server/functions/retrieveRegistrationStatus.js b/app/cloud/server/functions/retrieveRegistrationStatus.js
index 8a66ba3fd39e..b4843af6d364 100644
--- a/app/cloud/server/functions/retrieveRegistrationStatus.js
+++ b/app/cloud/server/functions/retrieveRegistrationStatus.js
@@ -12,7 +12,7 @@ export function retrieveRegistrationStatus() {
 	};
 
 	const firstUser = Users.getOldest({ emails: 1 });
-	info.email = firstUser && firstUser.emails[0].address;
+	info.email = firstUser && firstUser.emails && firstUser.emails[0].address;
 
 	if (settings.get('Organization_Email')) {
 		info.email = settings.get('Organization_Email');

From f87e202534d1a00b1378cf11f658f1af23d84674 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 28 Apr 2019 20:37:16 -0300
Subject: [PATCH 4/8] Merge pull request #14293 from RocketChat/fix-14285

[FIX] Error when accessing avatar with no token
---
 server/routes/avatar/utils.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/routes/avatar/utils.js b/server/routes/avatar/utils.js
index 0121ca3eda87..0db31ea180fd 100644
--- a/server/routes/avatar/utils.js
+++ b/server/routes/avatar/utils.js
@@ -42,6 +42,10 @@ function isUserAuthenticated({ headers, query }) {
 		rc_token = cookie.get('rc_token', headers.cookie);
 	}
 
+	if (rc_uid == null || rc_token == null) {
+		return false;
+	}
+
 	const userFound = Users.findOneByIdAndLoginToken(rc_uid, rc_token, { fields: { _id: 1 } });
 
 	return !!rc_uid && !!rc_token && !!userFound;

From c4ba45d6bd553eab854844a2ba46223547397ee8 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Date: Sun, 28 Apr 2019 18:37:55 -0500
Subject: [PATCH 5/8] [FIX] Optional exit on Unhandled Promise Rejection
 (#14291)

* unhandledpromiserejection error logs

* linting

* also exit if development environment
---
 app/lib/server/lib/meteorFixes.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/lib/server/lib/meteorFixes.js b/app/lib/server/lib/meteorFixes.js
index dd49652d928a..c1c64423e236 100644
--- a/app/lib/server/lib/meteorFixes.js
+++ b/app/lib/server/lib/meteorFixes.js
@@ -60,7 +60,15 @@ Meteor.setInterval(() => {
  */
 
 process.on('unhandledRejection', (error) => {
+	console.error('=== UnHandledPromiseRejection ===');
 	console.error(error);
-	console.error('Exiting due to an unhandled promise rejection');
-	process.exit(1);
+	console.error('---------------------------------');
+	console.error('Errors like this can cause oplog processing errors.');
+	console.error('Setting EXIT_UNHANDLEDPROMISEREJECTION will cause the process to exit allowing your service to automatically restart the process');
+	console.error('Future node.js versions will automatically exit the process');
+	console.error('=================================');
+
+	if (process.env.NODE_ENV === 'development' || process.env.EXIT_UNHANDLEDPROMISEREJECTION) {
+		process.exit(1);
+	}
 });

From 8d0e2f573ae7c3ea39dec043e463f0f9e1f29d80 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Date: Sun, 28 Apr 2019 18:39:02 -0500
Subject: [PATCH 6/8] [Fix] switch oplog required doc link to more accurate
 link (#14288)

[FIX] Switch oplog required doc link to more accurate link
---
 server/startup/serverRunning.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/startup/serverRunning.js b/server/startup/serverRunning.js
index 64867a1aa94c..68809a2009ff 100644
--- a/server/startup/serverRunning.js
+++ b/server/startup/serverRunning.js
@@ -49,7 +49,7 @@ Meteor.startup(function() {
 		msg = msg.join('\n');
 
 		if (!isOplogEnabled) {
-			msg += ['', '', 'OPLOG / REPLICASET IS REQUIRED TO RUN ROCKET.CHAT, MORE INFORMATION AT:', 'https://rocket.chat/docs/installation/docker-containers/high-availability-install'].join('\n');
+			msg += ['', '', 'OPLOG / REPLICASET IS REQUIRED TO RUN ROCKET.CHAT, MORE INFORMATION AT:', 'https://go.rocket.chat/i/oplog-required'].join('\n');
 			SystemLogger.error_box(msg, 'SERVER ERROR');
 
 			return process.exit(1);

From 924ad4ef0f7826544d27235b3667624fcd8341c2 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Date: Sun, 28 Apr 2019 20:08:34 -0500
Subject: [PATCH 7/8] Popup cloud console in new tab (#14296)

---
 app/cloud/client/admin/cloud.html | 2 +-
 app/cloud/client/admin/cloud.js   | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/cloud/client/admin/cloud.html b/app/cloud/client/admin/cloud.html
index e1d34a183467..d8bbfc0bf321 100644
--- a/app/cloud/client/admin/cloud.html
+++ b/app/cloud/client/admin/cloud.html
@@ -2,7 +2,7 @@
 	<div class="main-content-flex">
 		<section class="page-container page-home page-static page-settings">
 			{{#header sectionName="Connectivity_Services" hideHelp=true fixedHeight=true fullpage=true}}
-				<button type="button" class="rc-button rc-button--primary action cloud-console-btn">{{_ "Cloud_console"}}</button>
+				<a href="https://cloud.rocket.chat" class="rc-button rc-button--primary action cloud-console-btn" target="_blank">{{_ "Cloud_console"}}</a>
 			{{/header}}
 			<div class="content">
 				{{#requiresPermission 'manage-cloud'}}
diff --git a/app/cloud/client/admin/cloud.js b/app/cloud/client/admin/cloud.js
index ac66d89bd2ce..2084644ddd77 100644
--- a/app/cloud/client/admin/cloud.js
+++ b/app/cloud/client/admin/cloud.js
@@ -211,10 +211,6 @@ Template.cloud.events({
 	'click .sync-btn'(e, i) {
 		i.syncWorkspace();
 	},
-
-	'click .cloud-console-btn'() {
-		window.location.href = 'https://cloud.rocket.chat';
-	},
 });
 
 Template.cloud.onRendered(() => {

From fbfd7ecdc458eb3fdfc6ab333cbd7ccf0fe1f541 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 28 Apr 2019 22:10:00 -0300
Subject: [PATCH 8/8] Bump version to 1.0.1

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 83 +++++++++++++++++++++++++++++++++++++++
 .travis/snap.sh           |  2 +-
 HISTORY.md                | 28 +++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 6 files changed, 115 insertions(+), 4 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index df89bd239089..82d4ee689ed7 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 1.0.0
+ENV RC_VERSION 1.0.1
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 739115d3c09a..499478ee9aac 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -29886,6 +29886,89 @@
           ]
         }
       ]
+    },
+    "1.0.1": {
+      "node_version": "8.11.4",
+      "npm_version": "6.4.1",
+      "mongo_versions": [
+        "3.2",
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "14296",
+          "title": "[FIX] Popup cloud console in new window",
+          "userLogin": "geekgonecrazy",
+          "milestone": "1.0.1",
+          "contributors": [
+            "geekgonecrazy"
+          ]
+        },
+        {
+          "pr": "14288",
+          "title": "[FIX] Switch oplog required doc link to more accurate link",
+          "userLogin": "geekgonecrazy",
+          "milestone": "1.0.1",
+          "contributors": [
+            "geekgonecrazy",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "14291",
+          "title": "[FIX] Optional exit on Unhandled Promise Rejection",
+          "userLogin": "geekgonecrazy",
+          "milestone": "1.0.1",
+          "contributors": [
+            "geekgonecrazy",
+            "web-flow",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "14293",
+          "title": "[FIX] Error when accessing avatar with no token",
+          "userLogin": "geekgonecrazy",
+          "milestone": "1.0.1",
+          "contributors": [
+            "geekgonecrazy",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "14286",
+          "title": "[FIX] Startup error in registration check",
+          "userLogin": "geekgonecrazy",
+          "milestone": "1.0.1",
+          "contributors": [
+            "geekgonecrazy",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "14290",
+          "title": "[FIX] Wrong header at Apps admin section",
+          "userLogin": "geekgonecrazy",
+          "milestone": "1.0.1",
+          "contributors": [
+            "geekgonecrazy",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "14282",
+          "title": "[FIX] Error when accessing an invalid file upload url",
+          "userLogin": "wreiske",
+          "milestone": "1.0.1",
+          "contributors": [
+            "wreiske",
+            "d-gubert",
+            "web-flow"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 81468e4c6552..26d588df8a31 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=1.0.0
+    RC_VERSION=1.0.1
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index f47c154cddf0..e802f4f6c1ec 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,32 @@
 
+# 1.0.1
+`2019-04-28  ·  7 🐛  ·  4 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.4`
+- NPM: `6.4.1`
+- MongoDB: `3.2, 3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+- Popup cloud console in new window ([#14296](https://github.com/RocketChat/Rocket.Chat/pull/14296))
+- Switch oplog required doc link to more accurate link ([#14288](https://github.com/RocketChat/Rocket.Chat/pull/14288))
+- Optional exit on Unhandled Promise Rejection ([#14291](https://github.com/RocketChat/Rocket.Chat/pull/14291))
+- Error when accessing avatar with no token ([#14293](https://github.com/RocketChat/Rocket.Chat/pull/14293))
+- Startup error in registration check ([#14286](https://github.com/RocketChat/Rocket.Chat/pull/14286))
+- Wrong header at Apps admin section ([#14290](https://github.com/RocketChat/Rocket.Chat/pull/14290))
+- Error when accessing an invalid file upload url ([#14282](https://github.com/RocketChat/Rocket.Chat/pull/14282) by [@wreiske](https://github.com/wreiske))
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@wreiske](https://github.com/wreiske)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@rodrigok](https://github.com/rodrigok)
+
 # 1.0.0
 `2019-04-28  ·  4 ️️️⚠️  ·  30 🎉  ·  32 🚀  ·  97 🐛  ·  173 🔍  ·  60 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 563f0ea25551..43bbbfac40e5 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "1.0.0"
+	"version": "1.0.1"
 }
diff --git a/package.json b/package.json
index edeaaf8f3770..099fa72f9273 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"