From 025c709921cc34e9b2ee446b17854fbe51581e17 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 31 Aug 2018 15:48:02 -0300
Subject: [PATCH] Bump version to 0.69.1

---
 .docker/Dockerfile.rhel                 |  2 +-
 .github/history.json                    | 43 +++++++++++++++++++++++++
 .sandstorm/sandstorm-pkgdef.capnp       |  4 +--
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 22 +++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 7 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 4e18d0e0630..870a98c07cd 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.69.0
+ENV RC_VERSION 0.69.1
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index feba5be4a6c..b0b510da35d 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -18636,6 +18636,49 @@
           ]
         }
       ]
+    },
+    "0.69.1": {
+      "node_version": "8.11.3",
+      "npm_version": "5.6.0",
+      "pull_requests": [
+        {
+          "pr": "11892",
+          "title": "[FIX] Hipchat import was failing when importing messages from a non existent user",
+          "userLogin": "rodrigok",
+          "milestone": "0.69.1",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11910",
+          "title": "[FIX] Hipchat importer was not importing users without emails and uploaded files",
+          "userLogin": "rodrigok",
+          "milestone": "0.69.1",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11893",
+          "title": " [FIX] App updates were not being shown correctly",
+          "userLogin": "rodrigok",
+          "milestone": "0.69.1",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11853",
+          "title": "[FIX] Duplicated message buttons",
+          "userLogin": "ubarsaiyan",
+          "milestone": "0.69.1",
+          "contributors": [
+            "ubarsaiyan",
+            "web-flow"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index c70bdc63e58..b44974b0926 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 95,  # Increment this for every release.
+		appVersion = 96,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.69.0"),
+		appMarketingVersion = (defaultText = "0.69.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
index 007a691a4b9..7bbcb7d98ff 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=0.69.0
+    RC_VERSION=0.69.1
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 2b4d3e45509..99c6b3581a5 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,26 @@
 
+# 0.69.1
+`2018-08-31  ·  4 🐛  ·  2 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.3`
+- NPM: `5.6.0`
+
+### 🐛 Bug fixes
+
+- Hipchat import was failing when importing messages from a non existent user ([#11892](https://github.com/RocketChat/Rocket.Chat/pull/11892))
+- Hipchat importer was not importing users without emails and uploaded files ([#11910](https://github.com/RocketChat/Rocket.Chat/pull/11910))
+- App updates were not being shown correctly ([#11893](https://github.com/RocketChat/Rocket.Chat/pull/11893))
+- Duplicated message buttons ([#11853](https://github.com/RocketChat/Rocket.Chat/pull/11853) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@ubarsaiyan](https://github.com/ubarsaiyan)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@rodrigok](https://github.com/rodrigok)
+
 # 0.69.0
 `2018-08-28  ·  10 🎉  ·  8 🚀  ·  35 🐛  ·  13 🔍  ·  25 👩‍💻👨‍💻`
 
diff --git a/package.json b/package.json
index 870b5eb3d22..559358f1c1d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.69.0",
+	"version": "0.69.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index e07dd4ce529..75232eb0805 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,4 +1,4 @@
 {
-	"version": "0.69.0",
+	"version": "0.69.1",
 	"marketplaceApiVersion": "1.0.0"
 }