7x31
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts

This commit is contained in:
Louis Lam 2023-10-09 21:32:40 +08:00
parent 852b3fa61b
commit 45b6fab313
3 changed files with 2268 additions and 2073 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/knex_init_db.js
View File

@ -275,7 +275,7 @@ async function createTables() {
table.boolean("active").notNullable().defaultTo(true); table.boolean("active").notNullable().defaultTo(true);
table.integer("user_id").unsigned(); table.integer("user_id").unsigned();
table.boolean("is_default").notNullable().defaultTo(false); table.boolean("is_default").notNullable().defaultTo(false);
table.text("config"); table.text("config", "longtext");
}); });
// monitor_notification // monitor_notification

0
db/patch-notification-config.sql → db/old_migrations/patch-notification-config.sql
View File

4339
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff