From 499ff2e17491ff616eab21e2cfdbc5e75cadd4c5 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 30 Jul 2018 21:12:09 -0300
Subject: [PATCH] Bump version to 0.68.1

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

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 95477f4ff81..34fa5382742 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.68.0
+ENV RC_VERSION 0.68.1
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 4ecc86c4f62..86e5f963a8a 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -17641,6 +17641,30 @@
       "node_version": "8.11.3",
       "npm_version": "5.6.0",
       "pull_requests": []
+    },
+    "0.68.1": {
+      "node_version": "8.11.3",
+      "npm_version": "5.6.0",
+      "pull_requests": [
+        {
+          "pr": "11613",
+          "title": "[FIX] `Jump to message` search result action",
+          "userLogin": "tassoevan",
+          "contributors": [
+            "tassoevan"
+          ]
+        },
+        {
+          "pr": "11597",
+          "title": "[FIX] HipChat importer wasn’t compatible with latest exports",
+          "userLogin": "rodrigok",
+          "contributors": [
+            "rodrigok",
+            "sampaiodiego",
+            "web-flow"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 3211a5ec105..7f4c56185e3 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 89,  # Increment this for every release.
+		appVersion = 90,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.68.0"),
+		appMarketingVersion = (defaultText = "0.68.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 72328c392f5..10ac39d5028 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.68.0
+    RC_VERSION=0.68.1
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index de726e17946..3d8fb72455e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,22 @@
 
+# 0.68.1
+`2018-07-30  ·  2 🐛  ·  3 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.3`
+- NPM: `5.6.0`
+
+### 🐛 Bug fixes
+
+- `Jump to message` search result action ([#11613](https://github.com/RocketChat/Rocket.Chat/pull/11613))
+- HipChat importer wasn’t compatible with latest exports ([#11597](https://github.com/RocketChat/Rocket.Chat/pull/11597))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
 # 0.68.0
 `2018-07-27  ·  2 ️️️⚠️  ·  13 🎉  ·  3 🚀  ·  23 🐛  ·  10 🔍  ·  21 👩‍💻👨‍💻`
 
diff --git a/package.json b/package.json
index ee936ac46bf..dad99b7448d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.68.0",
+	"version": "0.68.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index c855b214bd3..dda0511e82b 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.68.0"
+	"version": "0.68.1"
 }