From 92eaebbfbbaedc1ef81e0c81a9b2c68853137351 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Fri, 17 Apr 2020 17:05:41 +0100
Subject: [PATCH] 1.2.0-rc1

---
 CHANGELOG.md            | 51 ++++++++++++++++++++++++++++++++++++++++-
 changelog.d/358.misc    |  1 -
 changelog.d/362.misc    |  1 -
 changelog.d/364.doc     |  1 -
 changelog.d/365.doc     |  1 -
 changelog.d/366.doc     |  1 -
 changelog.d/367.doc     |  1 -
 changelog.d/368.bugfix  |  1 -
 changelog.d/372.doc     |  1 -
 changelog.d/374.misc    |  1 -
 changelog.d/375.misc    |  1 -
 changelog.d/377.bugfix  |  1 -
 changelog.d/379.misc    |  1 -
 changelog.d/380.feature |  1 -
 changelog.d/381.misc    |  1 -
 changelog.d/382.misc    |  1 -
 changelog.d/383.misc    |  1 -
 changelog.d/384.misc    |  1 -
 changelog.d/385.misc    |  1 -
 changelog.d/386.misc    |  1 -
 changelog.d/387.misc    |  1 -
 changelog.d/392.bugfix  |  1 -
 changelog.d/393.misc    |  1 -
 changelog.d/395.bugfix  |  1 -
 changelog.d/396.misc    |  1 -
 package-lock.json       |  2 +-
 package.json            |  2 +-
 27 files changed, 52 insertions(+), 27 deletions(-)
 delete mode 100644 changelog.d/358.misc
 delete mode 100644 changelog.d/362.misc
 delete mode 100644 changelog.d/364.doc
 delete mode 100644 changelog.d/365.doc
 delete mode 100644 changelog.d/366.doc
 delete mode 100644 changelog.d/367.doc
 delete mode 100644 changelog.d/368.bugfix
 delete mode 100644 changelog.d/372.doc
 delete mode 100644 changelog.d/374.misc
 delete mode 100644 changelog.d/375.misc
 delete mode 100644 changelog.d/377.bugfix
 delete mode 100644 changelog.d/379.misc
 delete mode 100644 changelog.d/380.feature
 delete mode 100644 changelog.d/381.misc
 delete mode 100644 changelog.d/382.misc
 delete mode 100644 changelog.d/383.misc
 delete mode 100644 changelog.d/384.misc
 delete mode 100644 changelog.d/385.misc
 delete mode 100644 changelog.d/386.misc
 delete mode 100644 changelog.d/387.misc
 delete mode 100644 changelog.d/392.bugfix
 delete mode 100644 changelog.d/393.misc
 delete mode 100644 changelog.d/395.bugfix
 delete mode 100644 changelog.d/396.misc

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9158507..7a22622b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,53 @@
- 1.1.0 (2020-02-21)
+1.2.0-rc1 (2020-04-17)
+=======================
+
+**BREAKING CHANGE** - Note that this release requires requests to /_matrix/provision are authenticated with the `hs_token`.
+
+Features
+--------
+
+- Add metrics for active users and rooms ([\#380](https://github.com/matrix-org/matrix-appservice-slack/issues/380))
+
+
+Bugfixes
+--------
+
+- Include server name in the Matrix users regex ([\#368](https://github.com/matrix-org/matrix-appservice-slack/issues/368))
+- Fix Slack user updates (e.g. to their Display name) not getting immediately synced with Workspace Sync enabled ([\#377](https://github.com/matrix-org/matrix-appservice-slack/issues/377))
+- Fix occasional crash if an error occurs handling a Slack event. ([\#392](https://github.com/matrix-org/matrix-appservice-slack/issues/392))
+- **SECURITY FIX** The bridge now requires authentication on the /_matrix/provision set of endpoints. It requires either an `access_token` query parameter or a `Authorization` header containing the `hs_token` provided in the registration file. ([\#395](https://github.com/matrix-org/matrix-appservice-slack/issues/395))
+
+
+Improved Documentation
+----------------------
+
+- Change NPM instructions to use the path config/config.yaml ([\#364](https://github.com/matrix-org/matrix-appservice-slack/issues/364))
+- Correct database name in a code example to slack_bridge ([\#365](https://github.com/matrix-org/matrix-appservice-slack/issues/365))
+- Minor wording changes in `getting_started.md` ([\#366](https://github.com/matrix-org/matrix-appservice-slack/issues/366))
+- Use a descriptive label for a link in README.md ([\#367](https://github.com/matrix-org/matrix-appservice-slack/issues/367))
+- Add documentation for Team Sync ([\#372](https://github.com/matrix-org/matrix-appservice-slack/issues/372))
+
+
+Internal Changes
+----------------
+
+- Add decorators to provisioning functions ([\#358](https://github.com/matrix-org/matrix-appservice-slack/issues/358))
+- Bump minimist from 1.2.0 to 1.2.2 ([\#362](https://github.com/matrix-org/matrix-appservice-slack/issues/362))
+- Correct ISlackEvent.user type; remove unused declarations ([\#374](https://github.com/matrix-org/matrix-appservice-slack/issues/374))
+- Enable code linting for no-any where it does matter ([\#375](https://github.com/matrix-org/matrix-appservice-slack/issues/375))
+- Fix read the docs and add new page to nav bar ([\#379](https://github.com/matrix-org/matrix-appservice-slack/issues/379))
+- Upgrade various low-risk dependencies ([\#381](https://github.com/matrix-org/matrix-appservice-slack/issues/381))
+- Upgrade uuid dependency ([\#382](https://github.com/matrix-org/matrix-appservice-slack/issues/382))
+- Upgrade quick-lru dependency (requires NodeJS >=10) ([\#383](https://github.com/matrix-org/matrix-appservice-slack/issues/383))
+- Add Launch config for VS Code and enable SourceMaps ([\#384](https://github.com/matrix-org/matrix-appservice-slack/issues/384))
+- Add error and debug logs to .gitignore ([\#385](https://github.com/matrix-org/matrix-appservice-slack/issues/385))
+- Remove chalk as a direct dependency ([\#386](https://github.com/matrix-org/matrix-appservice-slack/issues/386))
+- Upgrade dependency pg-promise 10, which requires PostgreSQL 11 ([\#387](https://github.com/matrix-org/matrix-appservice-slack/issues/387))
+- Fix PostgreSQL errors when a metric activity is recorded twice ([\#393](https://github.com/matrix-org/matrix-appservice-slack/issues/393))
+- Updated dependency `matrix-appservice-bridge` to `1.12.2` ([\#396](https://github.com/matrix-org/matrix-appservice-slack/issues/396))
+
+
+1.1.0 (2020-02-21)
 ===================
 
 No significant changes.
diff --git a/changelog.d/358.misc b/changelog.d/358.misc
deleted file mode 100644
index 865a3043..00000000
--- a/changelog.d/358.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add decorators to provisioning functions
\ No newline at end of file
diff --git a/changelog.d/362.misc b/changelog.d/362.misc
deleted file mode 100644
index e7182b7b..00000000
--- a/changelog.d/362.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump minimist from 1.2.0 to 1.2.2
diff --git a/changelog.d/364.doc b/changelog.d/364.doc
deleted file mode 100644
index 20660136..00000000
--- a/changelog.d/364.doc
+++ /dev/null
@@ -1 +0,0 @@
-Change NPM instructions to use the path config/config.yaml
\ No newline at end of file
diff --git a/changelog.d/365.doc b/changelog.d/365.doc
deleted file mode 100644
index a04567c8..00000000
--- a/changelog.d/365.doc
+++ /dev/null
@@ -1 +0,0 @@
-Correct database name in a code example to slack_bridge
\ No newline at end of file
diff --git a/changelog.d/366.doc b/changelog.d/366.doc
deleted file mode 100644
index dc6dd58b..00000000
--- a/changelog.d/366.doc
+++ /dev/null
@@ -1 +0,0 @@
-Minor wording changes in `getting_started.md`
diff --git a/changelog.d/367.doc b/changelog.d/367.doc
deleted file mode 100644
index fdbc3c08..00000000
--- a/changelog.d/367.doc
+++ /dev/null
@@ -1 +0,0 @@
-Use a descriptive label for a link in README.md
\ No newline at end of file
diff --git a/changelog.d/368.bugfix b/changelog.d/368.bugfix
deleted file mode 100644
index bfe54b4f..00000000
--- a/changelog.d/368.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Include server name in the Matrix users regex
\ No newline at end of file
diff --git a/changelog.d/372.doc b/changelog.d/372.doc
deleted file mode 100644
index aa22ae37..00000000
--- a/changelog.d/372.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add documentation for Team Sync
\ No newline at end of file
diff --git a/changelog.d/374.misc b/changelog.d/374.misc
deleted file mode 100644
index 5cffb8fd..00000000
--- a/changelog.d/374.misc
+++ /dev/null
@@ -1 +0,0 @@
-Correct ISlackEvent.user type; remove unused declarations
\ No newline at end of file
diff --git a/changelog.d/375.misc b/changelog.d/375.misc
deleted file mode 100644
index 0c21003d..00000000
--- a/changelog.d/375.misc
+++ /dev/null
@@ -1 +0,0 @@
-Enable code linting for no-any where it does matter
\ No newline at end of file
diff --git a/changelog.d/377.bugfix b/changelog.d/377.bugfix
deleted file mode 100644
index c48d438e..00000000
--- a/changelog.d/377.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix Slack user updates (e.g. to their Display name) not getting immediately synced with Workspace Sync enabled
\ No newline at end of file
diff --git a/changelog.d/379.misc b/changelog.d/379.misc
deleted file mode 100644
index e95ed16b..00000000
--- a/changelog.d/379.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix read the docs and add new page to nav bar
diff --git a/changelog.d/380.feature b/changelog.d/380.feature
deleted file mode 100644
index e244d396..00000000
--- a/changelog.d/380.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add metrics for active users and rooms
\ No newline at end of file
diff --git a/changelog.d/381.misc b/changelog.d/381.misc
deleted file mode 100644
index c093264e..00000000
--- a/changelog.d/381.misc
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade various low-risk dependencies
\ No newline at end of file
diff --git a/changelog.d/382.misc b/changelog.d/382.misc
deleted file mode 100644
index 556737dd..00000000
--- a/changelog.d/382.misc
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade uuid dependency
\ No newline at end of file
diff --git a/changelog.d/383.misc b/changelog.d/383.misc
deleted file mode 100644
index 4e5ead6c..00000000
--- a/changelog.d/383.misc
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade quick-lru dependency (requires NodeJS >=10)
\ No newline at end of file
diff --git a/changelog.d/384.misc b/changelog.d/384.misc
deleted file mode 100644
index b54cc014..00000000
--- a/changelog.d/384.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add Launch config for VS Code and enable SourceMaps
\ No newline at end of file
diff --git a/changelog.d/385.misc b/changelog.d/385.misc
deleted file mode 100644
index 7367ba47..00000000
--- a/changelog.d/385.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add error and debug logs to .gitignore
\ No newline at end of file
diff --git a/changelog.d/386.misc b/changelog.d/386.misc
deleted file mode 100644
index 1b603812..00000000
--- a/changelog.d/386.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove chalk as a direct dependency
\ No newline at end of file
diff --git a/changelog.d/387.misc b/changelog.d/387.misc
deleted file mode 100644
index dbf8f39b..00000000
--- a/changelog.d/387.misc
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade dependency pg-promise 10, which requires PostgreSQL 11
\ No newline at end of file
diff --git a/changelog.d/392.bugfix b/changelog.d/392.bugfix
deleted file mode 100644
index 918b9d6f..00000000
--- a/changelog.d/392.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix occasional crash if an error occurs handling a Slack event.
\ No newline at end of file
diff --git a/changelog.d/393.misc b/changelog.d/393.misc
deleted file mode 100644
index 54104bb4..00000000
--- a/changelog.d/393.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix PostgreSQL errors when a metric activity is recorded twice
\ No newline at end of file
diff --git a/changelog.d/395.bugfix b/changelog.d/395.bugfix
deleted file mode 100644
index 82ca4203..00000000
--- a/changelog.d/395.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-**SECURITY FIX** The bridge now requires authentication on the /_matrix/provision set of endpoints. It requires either an `access_token` query parameter or a `Authorization` header containing the `hs_token` provided in the registration file.
\ No newline at end of file
diff --git a/changelog.d/396.misc b/changelog.d/396.misc
deleted file mode 100644
index 58d8460c..00000000
--- a/changelog.d/396.misc
+++ /dev/null
@@ -1 +0,0 @@
-Updated dependency `matrix-appservice-bridge` to `1.12.2`
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index df4c47c4..d0f81643 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-slack",
-  "version": "1.1.0",
+  "version": "1.2.0-rc1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 01018fc6..b38a2208 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-slack",
-  "version": "1.1.0",
+  "version": "1.2.0-rc1",
   "description": "A Matrix <--> Slack bridge",
   "main": "app.js",
   "scripts": {