Merge branch 'master'

2019-05-08 23:57:57 +02:00
parent c097a29d69
commit 3a3ccf801b
326 changed files with 37528 additions and 829 deletions
--- a/routers/user/setting/applications.go
+++ b/routers/user/setting/applications.go
@@ -49,7 +49,7 @@ func ApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm) {
 	}

 	ctx.Flash.Success(ctx.Tr("settings.generate_token_success"))
-	ctx.Flash.Info(t.Sha1)
+	ctx.Flash.Info(t.Token)

 	ctx.Redirect(setting.AppSubURL + "/user/settings/applications")
 }