Merge branch 'master' into advanced-permissions-phase-1

cmd/commands/user.go

@@ -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 {