Merge pull request #1844 from hackmdio/release/2.5.1

Release 2.5.1
hackmdio · Jan 3, 2024 · d6ac65e · d6ac65e
2 parents 78e6663 + b0d1999
commit d6ac65e
Show file tree

Hide file tree

Showing 5 changed files with 22,710 additions and 1,103 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,6 +15,12 @@ jobs:
  steps:
  - uses: actions/checkout@v2
 
+ # from https://stackoverflow.com/a/69649733
+ - name: Reconfigure git to use HTTP authentication
+ run: >
+ git config --global url."https://github.com/".insteadOf
+ ssh:https://[email protected]/
+
  - uses: actions/cache@v2
  with:
  path: ~/.npm

diff --git a/lib/auth/mattermost/index.js b/lib/auth/mattermost/index.js
@@ -3,7 +3,7 @@ require('babel-polyfill')
 require('isomorphic-fetch')
 const Router = require('express').Router
 const passport = require('passport')
-const MattermostClient = require('mattermost-redux/client/client4').default
+const { Client4: MattermostClient } = require('@mattermost/client')
 const OAuthStrategy = require('passport-oauth2').Strategy
 const config = require('../../config')
 const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')