summaryrefslogtreecommitdiff
path: root/db/schema.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-04-19 14:48:31 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-04-19 14:48:31 +0000
commit40a972057da58dd5c15cf0f0b2952f264dba0076 (patch)
treec454dd64d0e8af557ad9bf71337ad5c4014efbef /db/schema.rb
parenta9da37434af6d44c5f851affd4bd69b370760e8e (diff)
parent5f570690d4cf5635eb41ec43f21bdf21f79c5dda (diff)
downloadgitlab-ce-40a972057da58dd5c15cf0f0b2952f264dba0076.tar.gz
Merge branch 'usage-ping-port' into 'master'
Usage ping port Closes #27750 See merge request !10481
Diffstat (limited to 'db/schema.rb')
-rw-r--r--db/schema.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb
index 26ec6367bd0..d46b7564958 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -116,6 +116,8 @@ ActiveRecord::Schema.define(version: 20170418103908) do
t.integer "unique_ips_limit_time_window"
t.boolean "unique_ips_limit_enabled", default: false, null: false
t.decimal "polling_interval_multiplier", default: 1.0, null: false
+ t.boolean "usage_ping_enabled", default: true, null: false
+ t.string "uuid"
end
create_table "audit_events", force: :cascade do |t|
@@ -1301,6 +1303,7 @@ ActiveRecord::Schema.define(version: 20170418103908) do
t.string "organization"
t.boolean "authorized_projects_populated"
t.boolean "ghost"
+ t.date "last_activity_on"
t.boolean "notified_of_own_activity"
t.boolean "require_two_factor_authentication_from_group", default: false, null: false
t.integer "two_factor_grace_period", default: 48, null: false