rebase and fixed conflicts

tamu-edu-students · Oct 3, 2024 · 02ada92 · 02ada92
1 parent cf3d9dc
commit 02ada92
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/db/migrate/20241002035856_create_users.rb b/db/migrate/20241002035856_create_users.rb
diff --git a/db/migrate/20241003041050_create_users.rb b/db/migrate/20241003041050_create_users.rb
@@ -4,6 +4,7 @@ def change
       t.string :email
       t.string :first_name
       t.string :last_name
+      t.references :role, null: false, foreign_key: true
 
       t.timestamps
     end