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 /app/controllers/admin | |
| 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 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 094eef28a43..9943745208e 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -74,8 +74,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :metrics_timeout, :metrics_method_call_threshold, :metrics_sample_interval, - :ip_blocking_enabled, - :dnsbl_servers_list, :recaptcha_enabled, :recaptcha_site_key, :recaptcha_private_key, |