diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-20 15:07:00 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-20 15:07:00 -0500 |
| commit | 985297d82ac706bee0a310bf61003ac1f5c56b8a (patch) | |
| tree | 309512a384624ac927e8cc11b1adc340134cf79b /db/schema.rb | |
| parent | 86b75f4713fa6cb14cbf443c1e29ca6384204b65 (diff) | |
| parent | 1553c560e0d02e670b7cec2b443545e67418b569 (diff) | |
| download | gitlab-ce-985297d82ac706bee0a310bf61003ac1f5c56b8a.tar.gz | |
Merge branch 'master' into issue_3945issue_3945
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index a7cadacc0ce..97594011a02 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -64,6 +64,8 @@ ActiveRecord::Schema.define(version: 20160120172143) 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| |