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 branch 'master' into advanced-permissions-phase-1

Browse Source
This commit is contained in:
George Goldberg
2018-03-19 10:53:37 +00:00
parent fadcdd271a 4b675b347b
commit 37f0e5e0eb
25 changed files with 571 additions and 342 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 {