diff --git a/.gitignore b/.gitignore index 6cb937077..36be4fa2c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ # or operating system, you probably want to add a global ignore instead: # git config --global core.excludesfile '~/.gitignore_global' +# generated files +db.schema.rb + # Ignore bundler config. /.bundle diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 38b11a95e..ed7db3afc 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -1457,7 +1457,7 @@ }, "depends_on": [ { - "ethnic": 0 + "ethnic_group": 0 } ] }, diff --git a/db/schema.rb b/db/schema.rb index e28e022c4..f24a56d2f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -281,10 +281,10 @@ ActiveRecord::Schema[7.0].define(version: 202202071123100) do t.string "last_sign_in_ip" t.integer "role" t.string "old_user_id" + t.string "phone" t.integer "failed_attempts", default: 0 t.string "unlock_token" t.datetime "locked_at", precision: nil - t.string "phone" t.index ["email"], name: "index_users_on_email", unique: true t.index ["organisation_id"], name: "index_users_on_organisation_id" t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true