diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-01-20 14:24:20 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-20 14:24:20 -0500 |
commit | 1553c560e0d02e670b7cec2b443545e67418b569 (patch) | |
tree | 81c4fbabbd376d80db86a09d39f79ea35abee068 /db/schema.rb | |
parent | a8a65afe1e953ce3a9fc151f9e033b99fc568fad (diff) | |
parent | 8536e083f7b2d7ed77ecae83774d75f68d66e0b4 (diff) | |
download | gitlab-ce-1553c560e0d02e670b7cec2b443545e67418b569.tar.gz |
Merge branch 'feature/check-against-rbl-only' into 'master'
Split from !2455
References #9092
See merge request !2515
Diffstat (limited to 'db/schema.rb')
-rw-r--r-- | db/schema.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 8e9501e4827..50ae69bdd0f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160119145451) do +ActiveRecord::Schema.define(version: 20160120130905) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -64,6 +64,8 @@ ActiveRecord::Schema.define(version: 20160119145451) do t.integer "metrics_sample_interval", default: 15 t.boolean "sentry_enabled", default: false t.string "sentry_dsn" + t.boolean "ip_blocking_enabled", default: false + t.text "dnsbl_servers_list" end create_table "audit_events", force: :cascade do |t| |