IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release-4.8' into t3mergetomaster

Browse Source
This commit is contained in:
Derrick Anderson
2018-03-12 16:47:55 -04:00
parent f2d26801b9 2b460da1d5
commit 0d1177cdf9
3 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/commands/user.go
View File

@@ -553,7 +553,7 @@ func migrateAuthToLdapCmdF(command *cobra.Command, args []string) error {
}
fromAuth := args[0]
matchField := args[1]
matchField := args[2]
if len(fromAuth) == 0 || (fromAuth != "email" && fromAuth != "gitlab" && fromAuth != "saml") {
return errors.New("Invalid from_auth argument")
@@ -594,7 +594,7 @@ func migrateAuthToSamlCmdF(command *cobra.Command, args []string) error {
matchesFile := ""
matches := map[string]string{}
if !autoFlag {
matchesFile = args[1]
matchesFile = args[2]
file, e := ioutil.ReadFile(matchesFile)
if e != nil {