Skip to content

Commit d6ac65e

Browse files
authored
Merge pull request #1844 from hackmdio/release/2.5.1
Release 2.5.1
2 parents 78e6663 + b0d1999 commit d6ac65e

File tree

5 files changed

+22710
-1103
lines changed

5 files changed

+22710
-1103
lines changed

.github/workflows/build.yml

+6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v2
1717

18+
# from https://stackoverflow.com/a/69649733
19+
- name: Reconfigure git to use HTTP authentication
20+
run: >
21+
git config --global url."https://github.com/".insteadOf
22+
23+
1824
- uses: actions/cache@v2
1925
with:
2026
path: ~/.npm

lib/auth/mattermost/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require('babel-polyfill')
33
require('isomorphic-fetch')
44
const Router = require('express').Router
55
const passport = require('passport')
6-
const MattermostClient = require('mattermost-redux/client/client4').default
6+
const { Client4: MattermostClient } = require('@mattermost/client')
77
const OAuthStrategy = require('passport-oauth2').Strategy
88
const config = require('../../config')
99
const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')

0 commit comments

Comments
 (0)