diff --git a/.docker/Dockerfile b/.docker/Dockerfile index b0645e0b776..928fc418db1 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,6 +1,6 @@ FROM rocketchat/base:8 -ENV RC_VERSION 0.63.0-rc.1 +ENV RC_VERSION 0.63.0-rc.2 MAINTAINER buildmaster@rocket.chat diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index f41aafe2f5d..3e864fcae67 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.63.0-rc.1"), + appMarketingVersion = (defaultText = "0.63.0-rc.2"), # 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 54c41169860..7fee6516771 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.63.0-rc.1 + RC_VERSION=0.63.0-rc.2 fi echo "Preparing to trigger a snap release for $CHANNEL channel" diff --git a/HISTORY.md b/HISTORY.md index 8ebcd59d968..04a15031986 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,8 @@ + +# 0.63.0-rc.2 (2018-04-03) + + + # 0.63.0-rc.1 (2018-03-30) diff --git a/package-lock.json b/package-lock.json index 8b30ae6eded..be36b24c56c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "0.63.0-develop", + "version": "0.63.0-rc.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e007d1fb962..5dbbfb561a3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "0.63.0-rc.1", + "version": "0.63.0-rc.2", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/" diff --git a/packages/rocketchat-katex/package-lock.json b/packages/rocketchat-katex/package-lock.json index 6ea79500d6c..cffb44d1b56 100644 --- a/packages/rocketchat-katex/package-lock.json +++ b/packages/rocketchat-katex/package-lock.json @@ -5,18 +5,17 @@ "requires": true, "dependencies": { "katex": { - "version": "https://registry.npmjs.org/katex/-/katex-0.7.1.tgz", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.7.1.tgz", "integrity": "sha1-BrtSmO+tBeHnIoA1uo4VkfMGG48=", "requires": { "match-at": "0.1.1" - }, - "dependencies": { - "match-at": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/match-at/-/match-at-0.1.1.tgz", - "integrity": "sha512-h4Yd392z9mST+dzc+yjuybOGFNOZjmXIPKWjxBd1Bb23r4SmDOsk2NYCU2BMUBGbSpZqwVsZYNq26QS3xfaT3Q==" - } } + }, + "match-at": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/match-at/-/match-at-0.1.1.tgz", + "integrity": "sha512-h4Yd392z9mST+dzc+yjuybOGFNOZjmXIPKWjxBd1Bb23r4SmDOsk2NYCU2BMUBGbSpZqwVsZYNq26QS3xfaT3Q==" } } } diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info index 5ec2156da2a..7ebf3bbee7b 100644 --- a/packages/rocketchat-lib/rocketchat.info +++ b/packages/rocketchat-lib/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "0.63.0-rc.1" + "version": "0.63.0-rc.2" }