Merge pull request #389 from cs169/main

CS169L SP24 Final Updates?
snap-cloud · Aug 1, 2024 · 07dde51 · 07dde51
2 parents 0e26688 + 9a9bd38
commit 07dde51
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -16,7 +16,7 @@
 #  confirmed_at           :datetime
 #  current_sign_in_at     :datetime
 #  current_sign_in_ip     :string
-#  default_currency       :text
+#  default_currency       :string
 #  email                  :string           default(""), not null
 #  email_public           :boolean          default(FALSE)
 #  encrypted_password     :string           default(""), not null

diff --git a/db/schema.rb b/db/schema.rb
@@ -628,7 +628,7 @@
     t.boolean "is_disabled", default: false
     t.string "picture"
     t.string "timezone"
-    t.text "default_currency"
+    t.string "default_currency"
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true

diff --git a/spec/factories/users.rb b/spec/factories/users.rb
@@ -16,7 +16,7 @@
 #  confirmed_at           :datetime
 #  current_sign_in_at     :datetime
 #  current_sign_in_ip     :string
-#  default_currency       :text
+#  default_currency       :string
 #  email                  :string           default(""), not null
 #  email_public           :boolean          default(FALSE)
 #  encrypted_password     :string           default(""), not null

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -16,7 +16,7 @@
 #  confirmed_at           :datetime
 #  current_sign_in_at     :datetime
 #  current_sign_in_ip     :string
-#  default_currency       :text
+#  default_currency       :string
 #  email                  :string           default(""), not null
 #  email_public           :boolean          default(FALSE)
 #  encrypted_password     :string           default(""), not null