summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-09 14:52:46 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-05-09 17:32:46 -0400
commit0c113c8dcb02e02457473823847b41df4eeedb88 (patch)
treee3a9d8e18981b8b72b09d48f44b1983e4d4704d1 /db
parent2ad1334d9e0e143eb1cd1694433bfdf29314a65e (diff)
downloadgitlab-ce-0c113c8dcb02e02457473823847b41df4eeedb88.tar.gz
Make otp_backup_codes a text field
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20150331183602_add_devise_two_factor_backupable_to_users.rb2
-rw-r--r--db/schema.rb5
2 files changed, 6 insertions, 1 deletions
diff --git a/db/migrate/20150331183602_add_devise_two_factor_backupable_to_users.rb b/db/migrate/20150331183602_add_devise_two_factor_backupable_to_users.rb
index 2feb49f43f1..913958db7c5 100644
--- a/db/migrate/20150331183602_add_devise_two_factor_backupable_to_users.rb
+++ b/db/migrate/20150331183602_add_devise_two_factor_backupable_to_users.rb
@@ -1,5 +1,5 @@
class AddDeviseTwoFactorBackupableToUsers < ActiveRecord::Migration
def change
- add_column :users, :otp_backup_codes, :string, array: true
+ add_column :users, :otp_backup_codes, :text
end
end
diff --git a/db/schema.rb b/db/schema.rb
index 04abf9bb9a6..3e5810d7408 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -492,6 +492,11 @@ ActiveRecord::Schema.define(version: 20150502064022) do
t.string "bitbucket_access_token"
t.string "bitbucket_access_token_secret"
t.string "location"
+ t.string "encrypted_otp_secret"
+ t.string "encrypted_otp_secret_iv"
+ t.string "encrypted_otp_secret_salt"
+ t.boolean "otp_required_for_login"
+ t.text "otp_backup_codes"
t.string "public_email", default: "", null: false
end