diff --git a/.docker/Dockerfile b/.docker/Dockerfile index e99f37a9126..22317a46d64 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,6 +1,6 @@ FROM rocketchat/base:8 -ENV RC_VERSION 0.64.0-rc.0 +ENV RC_VERSION 0.64.0-rc.1 MAINTAINER buildmaster@rocket.chat diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index fc6ca325de3..981fdda9271 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.64.0-rc.0 +ENV RC_VERSION 0.64.0-rc.1 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index 76c647dd93e..24ce390d41d 100644 --- a/.github/history.json +++ b/.github/history.json @@ -13008,5 +13008,36 @@ "geekgonecrazy" ] } + ], + "0.64.0-rc.1": [ + { + "pr": "10545", + "title": "LingoHub based on develop", + "userLogin": "engelgabriel", + "milestone": "0.64.0", + "contributors": [ + "rodrigok" + ] + }, + { + "pr": "10544", + "title": "Regression: Revert announcement structure", + "userLogin": "gdelavald", + "milestone": "0.64.0", + "contributors": [ + "gdelavald", + "rodrigok", + "web-flow" + ] + }, + { + "pr": "10543", + "title": "Regression: Upload was not working", + "userLogin": "rodrigok", + "milestone": "0.64.0", + "contributors": [ + "rodrigok" + ] + } ] } \ No newline at end of file diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 16648e66dbc..56d655b869b 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = ( appVersion = 62, # Increment this for every release. - appMarketingVersion = (defaultText = "0.64.0-rc.0"), + appMarketingVersion = (defaultText = "0.64.0-rc.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 e7eec4aa04d..7c107a923b6 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.64.0-rc.0 + RC_VERSION=0.64.0-rc.1 fi echo "Preparing to trigger a snap release for $CHANNEL channel" diff --git a/HISTORY.md b/HISTORY.md index e55e6d791db..98d8b4fd4a7 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,18 @@ # 0.64.0 (Under Release Candidate Process) +## 0.64.0-rc.1 +`2018-04-21 ยท 3 ๐Ÿ”` + +
+๐Ÿ” Minor changes + +- LingoHub based on develop ([#10545](https://github.com/RocketChat/Rocket.Chat/pull/10545)) +- Regression: Revert announcement structure ([#10544](https://github.com/RocketChat/Rocket.Chat/pull/10544)) +- Regression: Upload was not working ([#10543](https://github.com/RocketChat/Rocket.Chat/pull/10543)) + +
+ ## 0.64.0-rc.0 `2018-04-21 ยท 2 ๏ธ๏ธ๏ธโš ๏ธ ยท 17 ๐ŸŽ‰ ยท 38 ๐Ÿ› ยท 17 ๐Ÿ” ยท 16 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/package.json b/package.json index 6c7e439c8d7..28fecae6224 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "0.64.0-rc.0", + "version": "0.64.0-rc.1", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/" diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info index 2106982f5f6..11ded984abe 100644 --- a/packages/rocketchat-lib/rocketchat.info +++ b/packages/rocketchat-lib/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "0.64.0-rc.0" + "version": "0.64.0-rc.1" }