Merge branch 'master' into feat/approval-new

# Conflicts: # models/error.go # models/migrations/migrations.go # models/models.go # public/js/index.js
2025-11-14 02:57:45 +08:00 · 2018-05-19 18:17:01 +02:00
parent e5bde1405f 81b4d38f01
commit a8dc699e74
251 changed files with 41347 additions and 145 deletions
--- a/models/models.go
+++ b/models/models.go
@@ -120,6 +120,7 @@ func init() {
 		new(LFSLock),
 		new(Reaction),
 		new(IssueAssignees),
+		new(U2FRegistration),
 		new(Review),
 	)