diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-01-28 16:28:19 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-28 16:28:19 -0500 |
commit | ca05054ea2a8aff81822f310c5dafb68ae26e10e (patch) | |
tree | 4c0167fa3d1aa0f08b9bc9e54d1a75b017594397 /db | |
parent | 2b1ddb0f807b328aae00b1d9b0fb7f62e8adbe59 (diff) | |
download | gitlab-ce-ca05054ea2a8aff81822f310c5dafb68ae26e10e.tar.gz |
Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blocking
This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20160128212447_remove_ip_blocking_settings_from_application_settings.rb | 6 | ||||
-rw-r--r-- | db/schema.rb | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/db/migrate/20160128212447_remove_ip_blocking_settings_from_application_settings.rb b/db/migrate/20160128212447_remove_ip_blocking_settings_from_application_settings.rb new file mode 100644 index 00000000000..41821cdcc42 --- /dev/null +++ b/db/migrate/20160128212447_remove_ip_blocking_settings_from_application_settings.rb @@ -0,0 +1,6 @@ +class RemoveIpBlockingSettingsFromApplicationSettings < ActiveRecord::Migration + def change + remove_column :application_settings, :ip_blocking_enabled, :boolean, default: false + remove_column :application_settings, :dnsbl_servers_list, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index 97594011a02..2a2911bfbc7 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: 20160120172143) do +ActiveRecord::Schema.define(version: 20160128212447) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -64,8 +64,6 @@ 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| |