Merge pull request #12499 from RocketChat/release-0.71.1

Release 0.71.1
RocketChat · Oct 31, 2018 · e73dc78 · e73dc78
2 parents b77359c + 4c87d58
commit e73dc78
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 7 deletions.
diff --git 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.71.0
+ENV RC_VERSION 0.71.1
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/.github/history.json b/.github/history.json
@@ -20365,6 +20365,20 @@
           ]
         }
       ]
+    },
+    "0.71.1": {
+      "node_version": "8.11.3",
+      "npm_version": "5.6.0",
+      "pull_requests": [
+        {
+          "pr": "12487",
+          "title": "[FIX] Email sending with GDPR user data",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 111,  # Increment this for every release.
+		appVersion = 112,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.71.0"),
+		appMarketingVersion = (defaultText = "0.71.1"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 

diff --git 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=0.71.0
+    RC_VERSION=0.71.1
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,4 +1,19 @@
 
+# 0.71.1
+`2018-10-31  ·  1 🐛  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.3`
+- NPM: `5.6.0`
+
+### 🐛 Bug fixes
+
+- Email sending with GDPR user data ([#12487](https://github.com/RocketChat/Rocket.Chat/pull/12487))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.71.0
 `2018-10-27  ·  2 ️️️⚠️  ·  5 🎉  ·  5 🚀  ·  21 🐛  ·  8 🔍  ·  20 👩‍💻👨‍💻`
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.71.0",
+	"version": "0.71.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.71.0"
+	"version": "0.71.1"
 }
diff --git a/packages/rocketchat-user-data-download/server/cronProcessDownloads.js b/packages/rocketchat-user-data-download/server/cronProcessDownloads.js
@@ -291,7 +291,7 @@ const sendEmail = function(userId) {
 	}
 	const userData = RocketChat.models.Users.findOneById(userId);
 
-	if (!userData || userData.emails || userData.emails[0] || userData.emails[0].address) {
+	if (!userData || !userData.emails || !userData.emails[0] || !userData.emails[0].address) {
 		return;
 	}
 	const emailAddress = `${ userData.name } <${ userData.emails[0].address }>`;