merge upstream, resolve migration conflicts

This commit is contained in:
Manush Dodunekov
2020-01-09 07:51:45 +01:00
38 changed files with 626 additions and 141 deletions
+2
View File
@@ -291,6 +291,8 @@ var migrations = []Migration{
// v117 -> v118
NewMigration("Add block on rejected reviews branch protection", addBlockOnRejectedReviews),
// v118 -> v119
NewMigration("Add commit id and stale to reviews", addReviewCommitAndStale),
// v119 -> v120
NewMigration("add is_restricted column for users table", addIsRestricted),
}