chore: merge from nightly branch into release branch in prep for next beta

1 files changed, 18 insertions, 0 deletions

diff --git a/src/internal-server/database/migrations/1503250034279_user.js b/src/internal-server/database/migrations/1503250034279_user.js
new file mode 100644
index 000000000..80b49020a
--- /dev/null
+++ b/src/internal-server/database/migrations/1503250034279_user.js
@@ -0,0 +1,18 @@
+/** @type {import('@adonisjs/lucid/src/Schema')} */
+const Schema = use('Schema');
+
+class UserSchema extends Schema {
+  up() {
+    this.create('users', (table) => {
+      table.increments();
+      table.json('settings');
+      table.timestamps();
+    });
+  }
+
+  down() {
+    this.drop('users');
+  }
+}
+
+module.exports = UserSchema;