From ec69a183ed6ea9a2bd39eac33b4f2f31a6054446 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 26 May 2018 16:02:28 -0300
Subject: [PATCH] Bump version to 0.65.0-rc.3
---
.docker/Dockerfile | 2 +-
.docker/Dockerfile.rhel | 2 +-
.github/history.json | 69 +++++++++++++++++++++++++
.sandstorm/sandstorm-pkgdef.capnp | 4 +-
.travis/snap.sh | 2 +-
HISTORY.md | 19 +++++++
package.json | 2 +-
packages/rocketchat-lib/rocketchat.info | 2 +-
8 files changed, 95 insertions(+), 7 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 2ee597b58e8..220d0de82ea 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
FROM rocketchat/base:8
-ENV RC_VERSION 0.65.0-rc.2
+ENV RC_VERSION 0.65.0-rc.3
MAINTAINER buildmaster@rocket.chat
diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 24e7583a0af..d7a00f448f4 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.65.0-rc.2
+ENV RC_VERSION 0.65.0-rc.3
MAINTAINER buildmaster@rocket.chat
diff --git a/.github/history.json b/.github/history.json
index 898c006a092..ce647faca41 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -14548,5 +14548,74 @@
"web-flow"
]
}
+ ],
+ "0.65.0-rc.3": [
+ {
+ "pr": "10875",
+ "title": "[FIX] Slack-Bridge bug when migrating to 0.64.1",
+ "userLogin": "iliaal",
+ "milestone": "0.65.0",
+ "contributors": [
+ null
+ ]
+ },
+ {
+ "pr": "10882",
+ "title": "Fix: Manage apps layout was a bit confuse",
+ "userLogin": "gdelavald",
+ "milestone": "0.65.0",
+ "contributors": [
+ "gdelavald",
+ "ggazzo",
+ "web-flow",
+ "rodrigok"
+ ]
+ },
+ {
+ "pr": "10886",
+ "title": "LingoHub based on develop",
+ "userLogin": "engelgabriel",
+ "milestone": "0.65.0",
+ "contributors": [
+ "rodrigok"
+ ]
+ },
+ {
+ "pr": "10887",
+ "title": "Fix: Regression Lazyload fix shuffle avatars",
+ "userLogin": "ggazzo",
+ "milestone": "0.65.0",
+ "contributors": [
+ "ggazzo"
+ ]
+ },
+ {
+ "pr": "10883",
+ "title": "[FIX] Horizontally align items in preview message",
+ "userLogin": "gdelavald",
+ "milestone": "0.65.0",
+ "contributors": [
+ "gdelavald"
+ ]
+ },
+ {
+ "pr": "10857",
+ "title": "Fix: typo on error message for push token API",
+ "userLogin": "rafaelks",
+ "milestone": "0.65.0",
+ "contributors": [
+ "rafaelks",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "10878",
+ "title": "[FIX] The first users was not set as admin some times",
+ "userLogin": "rodrigok",
+ "milestone": "0.65.0",
+ "contributors": [
+ "rodrigok"
+ ]
+ }
]
}
\ No newline at end of file
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 603ce78d029..862f905b099 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
appTitle = (defaultText = "Rocket.Chat"),
- appVersion = 68, # Increment this for every release.
+ appVersion = 69, # Increment this for every release.
- appMarketingVersion = (defaultText = "0.65.0-rc.2"),
+ appMarketingVersion = (defaultText = "0.65.0-rc.3"),
# 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 5e43b5eb76e..b78f36f1eb1 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.65.0-rc.2
+ RC_VERSION=0.65.0-rc.3
fi
echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index f55b9fb04ef..52fbf11603f 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,25 @@
# 0.65.0 (Under Release Candidate Process)
+## 0.65.0-rc.3
+`2018-05-26 · 3 🛠· 4 ðŸ”`
+
+### 🛠Bug fixes
+
+- Slack-Bridge bug when migrating to 0.64.1 ([#10875](https://github.com/RocketChat/Rocket.Chat/pull/10875))
+- Horizontally align items in preview message ([#10883](https://github.com/RocketChat/Rocket.Chat/pull/10883))
+- The first users was not set as admin some times ([#10878](https://github.com/RocketChat/Rocket.Chat/pull/10878))
+
+<details>
+<summary>🔠Minor changes</summary>
+
+- Fix: Manage apps layout was a bit confuse ([#10882](https://github.com/RocketChat/Rocket.Chat/pull/10882))
+- LingoHub based on develop ([#10886](https://github.com/RocketChat/Rocket.Chat/pull/10886))
+- Fix: Regression Lazyload fix shuffle avatars ([#10887](https://github.com/RocketChat/Rocket.Chat/pull/10887))
+- Fix: typo on error message for push token API ([#10857](https://github.com/RocketChat/Rocket.Chat/pull/10857))
+
+</details>
+
## 0.65.0-rc.2
`2018-05-23 · 2 🛠· 5 🔠· 1 👩â€ðŸ’»ðŸ‘¨â€ðŸ’»`
diff --git a/package.json b/package.json
index 8db3ee0af04..f7c34cd0cd6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "Rocket.Chat",
"description": "The Ultimate Open Source WebChat Platform",
- "version": "0.65.0-rc.2",
+ "version": "0.65.0-rc.3",
"author": {
"name": "Rocket.Chat",
"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 87da4b12627..9f4dba271bd 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
{
- "version": "0.65.0-rc.2"
+ "version": "0.65.0-rc.3"
}
--
GitLab