summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2015-12-18 18:29:13 -0200
committerGabriel Mazetto <gabriel@gitlab.com>2015-12-24 19:00:18 -0200
commit33964469b38e2b36b200b20fe3061371a5f5ab18 (patch)
tree72a4eaae98645d02803cd212d871dd22d9fca53d /db
parent7b25da74ea017814c3f420bd57470af483617d4f (diff)
downloadgitlab-ce-33964469b38e2b36b200b20fe3061371a5f5ab18.tar.gz
WIP require two factor authentication
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20151218154042_add_tfa_to_application_settings.rb8
-rw-r--r--db/schema.rb2
2 files changed, 10 insertions, 0 deletions
diff --git a/db/migrate/20151218154042_add_tfa_to_application_settings.rb b/db/migrate/20151218154042_add_tfa_to_application_settings.rb
new file mode 100644
index 00000000000..dd95db775c5
--- /dev/null
+++ b/db/migrate/20151218154042_add_tfa_to_application_settings.rb
@@ -0,0 +1,8 @@
+class AddTfaToApplicationSettings < ActiveRecord::Migration
+ def change
+ change_table :application_settings do |t|
+ t.boolean :require_two_factor_authentication, default: false
+ t.integer :two_factor_grace_period, default: 48
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0d53105b057..631979a7fd8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -50,6 +50,8 @@ ActiveRecord::Schema.define(version: 20151224123230) do
t.boolean "shared_runners_enabled", default: true, null: false
t.integer "max_artifacts_size", default: 100, null: false
t.string "runners_registration_token"
+ t.boolean "require_two_factor_authentication", default: false
+ t.integer "two_factor_grace_period", default: 48
end
create_table "audit_events", force: :cascade do |t|