Bump version to 1.2.0

6 years ago · 918311f927
parent a3f5320cdb
commit 918311f927
6 changed files with 94 additions and 50 deletions
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7

-ENV RC_VERSION 1.2.0-rc.2
+ENV RC_VERSION 1.2.0

 MAINTAINER buildmaster@rocket.chat

--- a/.github/history.json
+++ b/.github/history.json
@ -32426,6 +32426,84 @@
          ]
        }
      ]
+    },
+    "1.2.0": {
+      "node_version": "8.11.4",
+      "npm_version": "6.4.1",
+      "mongo_versions": [
+        "3.2",
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "14850",
+          "title": "Release 1.1.3",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "ggazzo",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "14763",
+          "title": "[FIX] User status information on User Info panel",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "1.1.2",
+          "contributors": [
+            "MarcosSpessatto"
+          ]
+        },
+        {
+          "pr": "14711",
+          "title": "[FIX] User Real Name being erased when not modified",
+          "userLogin": "Hudell",
+          "milestone": "1.1.2",
+          "contributors": [
+            "Hudell"
+          ]
+        },
+        {
+          "pr": "14717",
+          "title": "[FIX] Anonymous chat read",
+          "userLogin": "sampaiodiego",
+          "milestone": "1.1.2",
+          "contributors": [
+            "sampaiodiego",
+            "ggazzo",
+            "MarcosSpessatto",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "14686",
+          "title": "[FIX] SAML login error.",
+          "userLogin": "Hudell",
+          "milestone": "1.1.1",
+          "contributors": [
+            "Hudell"
+          ]
+        },
+        {
+          "pr": "14668",
+          "title": "[FIX] Load messages after disconnect and message box scroll missing",
+          "userLogin": "ggazzo",
+          "milestone": "1.1.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "14674",
+          "title": "Removing unnecesary federation configs",
+          "userLogin": "alansikora",
+          "milestone": "1.1.1",
+          "contributors": [
+            "alansikora"
+          ]
+        }
+      ]
    }
  }
 }
--- 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=1.2.0-rc.2
+    RC_VERSION=1.2.0
 fi

 echo "Preparing to trigger a snap release for $CHANNEL channel"
--- a/HISTORY.md
+++ b/HISTORY.md
@ -1,51 +1,11 @@

-# 1.2.0 (Under Release Candidate Process)
+# 1.2.0
+`2019-06-27  ·  8 🎉  ·  4 🚀  ·  12 🐛  ·  8 🔍  ·  21 👩‍💻👨‍💻`

-## 1.2.0-rc.2
-`2019-06-27  ·  1 🎉  ·  1 🐛  ·  3 👩‍💻👨‍💻`
-
-### 🎉 New features
-
- Show App bundles and its apps ([#14886](https://github.com/RocketChat/Rocket.Chat/pull/14886))
-
-### 🐛 Bug fixes
-
- LinkedIn OAuth login ([#14887](https://github.com/RocketChat/Rocket.Chat/pull/14887))
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
- [@Hudell](https://github.com/Hudell)
- [@rodrigok](https://github.com/rodrigok)
- [@sampaiodiego](https://github.com/sampaiodiego)
-
-## 1.2.0-rc.1
-`2019-06-27  ·  1 🐛  ·  3 🔍  ·  4 👩‍💻👨‍💻`
-
-### 🐛 Bug fixes
-
- Custom status fixes ([#14853](https://github.com/RocketChat/Rocket.Chat/pull/14853) by [@wreiske](https://github.com/wreiske))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
- Regression: Fix desktop notifications not being sent ([#14860](https://github.com/RocketChat/Rocket.Chat/pull/14860))
- Regression: Allow debugging of cached collections by name ([#14862](https://github.com/RocketChat/Rocket.Chat/pull/14862))
- Allow debugging of cached collections by name ([#14859](https://github.com/RocketChat/Rocket.Chat/pull/14859))
-
-</details>
-
-### 👩‍💻👨‍💻 Contributors 😍
-
- [@wreiske](https://github.com/wreiske)
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
- [@Hudell](https://github.com/Hudell)
- [@ggazzo](https://github.com/ggazzo)
- [@sampaiodiego](https://github.com/sampaiodiego)
-
-## 1.2.0-rc.0
-`2019-06-21  ·  7 🎉  ·  4 🚀  ·  10 🐛  ·  5 🔍  ·  21 👩‍💻👨‍💻`
+### Engine versions
+- Node: `8.11.4`
+- NPM: `6.4.1`
+- MongoDB: `3.2, 3.4, 3.6, 4.0`

 ### 🎉 New features

@ -56,6 +16,7 @@
 - Endpoint to anonymously read channel's messages ([#14714](https://github.com/RocketChat/Rocket.Chat/pull/14714))
 - Add Livechat inquiries endpoints ([#14779](https://github.com/RocketChat/Rocket.Chat/pull/14779))
 - Configuration to limit amount of livechat inquiries displayed ([#14690](https://github.com/RocketChat/Rocket.Chat/pull/14690))
+- Show App bundles and its apps ([#14886](https://github.com/RocketChat/Rocket.Chat/pull/14886))

 ### 🚀 Improvements

@ -76,6 +37,8 @@
 - Import Chart.js error ([#14471](https://github.com/RocketChat/Rocket.Chat/pull/14471) by [@sonbn0](https://github.com/sonbn0))
 - Name is undefined in some emails ([#14533](https://github.com/RocketChat/Rocket.Chat/pull/14533))
 - Direct reply delete config and description ([#14493](https://github.com/RocketChat/Rocket.Chat/pull/14493) by [@ruKurz](https://github.com/ruKurz))
+- Custom status fixes ([#14853](https://github.com/RocketChat/Rocket.Chat/pull/14853) by [@wreiske](https://github.com/wreiske))
+- LinkedIn OAuth login ([#14887](https://github.com/RocketChat/Rocket.Chat/pull/14887))

 <details>
 <summary>🔍 Minor changes</summary>
@ -85,6 +48,9 @@
 - Extract permissions functions ([#14777](https://github.com/RocketChat/Rocket.Chat/pull/14777))
 - Add custom fileupload whitelist property ([#14754](https://github.com/RocketChat/Rocket.Chat/pull/14754))
 - Merge master into develop & Set version to 1.2.0-develop ([#14656](https://github.com/RocketChat/Rocket.Chat/pull/14656) by [@AnBo83](https://github.com/AnBo83) & [@knrt10](https://github.com/knrt10) & [@lolimay](https://github.com/lolimay) & [@mohamedar97](https://github.com/mohamedar97) & [@thaiphv](https://github.com/thaiphv))
+- Regression: Fix desktop notifications not being sent ([#14860](https://github.com/RocketChat/Rocket.Chat/pull/14860))
+- Regression: Allow debugging of cached collections by name ([#14862](https://github.com/RocketChat/Rocket.Chat/pull/14862))
+- Allow debugging of cached collections by name ([#14859](https://github.com/RocketChat/Rocket.Chat/pull/14859))

 </details>

--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@ -1,3 +1,3 @@
 {
-	"version": "1.2.0-rc.2"
+	"version": "1.2.0"
 }
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "1.2.0-rc.2",
+	"version": "1.2.0",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"