summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-03-14 14:34:21 +0100
committerAlexis Reigel <mail@koffeinfrei.org>2017-04-06 10:01:14 +0200
commit1735ed613910b38c4c069da9c4637bbc4856db36 (patch)
tree7c7982af2bd8777bc919bef331edc9a0a1513eec /db
parent20575859b1bf431421427d52c4ac5a33cf662df6 (diff)
downloadgitlab-ce-1735ed613910b38c4c069da9c4637bbc4856db36.tar.gz
rename cache db column with `_cached` suffix
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20170124193205_add_two_factor_columns_to_users.rb4
-rw-r--r--db/schema.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/db/migrate/20170124193205_add_two_factor_columns_to_users.rb b/db/migrate/20170124193205_add_two_factor_columns_to_users.rb
index bef1b2062c8..1d1021fcbb3 100644
--- a/db/migrate/20170124193205_add_two_factor_columns_to_users.rb
+++ b/db/migrate/20170124193205_add_two_factor_columns_to_users.rb
@@ -6,12 +6,12 @@ class AddTwoFactorColumnsToUsers < ActiveRecord::Migration
disable_ddl_transaction!
def up
- add_column_with_default(:users, :require_two_factor_authentication, :boolean, default: false)
+ add_column_with_default(:users, :require_two_factor_authentication_from_group, :boolean, default: false)
add_column_with_default(:users, :two_factor_grace_period, :integer, default: 48)
end
def down
- remove_column(:users, :require_two_factor_authentication)
+ remove_column(:users, :require_two_factor_authentication_from_group)
remove_column(:users, :two_factor_grace_period)
end
end
diff --git a/db/schema.rb b/db/schema.rb
index 2d2507828d4..62b9a766ff3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1249,7 +1249,7 @@ ActiveRecord::Schema.define(version: 20170402231018) do
t.boolean "authorized_projects_populated"
t.boolean "ghost"
t.boolean "notified_of_own_activity"
- t.boolean "require_two_factor_authentication", default: false, null: false
+ t.boolean "require_two_factor_authentication_from_group", default: false, null: false
t.integer "two_factor_grace_period", default: 48, null: false
end