Merge conflicts

7 months ago · 45b6fab313
parent 852b3fa61b
commit 45b6fab313
3 changed files with 4355 additions and 4160 deletions
--- a/db/knex_init_db.js
+++ b/db/knex_init_db.js
@ -275,7 +275,7 @@ async function createTables() {
        table.boolean("active").notNullable().defaultTo(true);
        table.integer("user_id").unsigned();
        table.boolean("is_default").notNullable().defaultTo(false);
-        table.text("config");
+        table.text("config", "longtext");
    });

    // monitor_notification
--- a/db/old_migrations/patch-notification-config.sql
+++ b/db/old_migrations/patch-notification-config.sql
--- a/package-lock.json
+++ b/package-lock.json