diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-14 01:38:30 +0300 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-03-16 14:58:05 +0300 |
| commit | 4b55923402f75ce7651bc173f2c3b46b397b7c88 (patch) | |
| tree | 801abc5464ae592013fce6332ccf283f9dae28ec /db/migrate | |
| parent | 6b6317a5d1608a524a80116e33ec9bf90f5354a9 (diff) | |
Merge branch 'fj-15329-services-callbacks-ssrf-10-4' into 'security-10-4'
[10.4] Server Side Request Forgery in Services and Web Hooks
See merge request gitlab/gitlabhq!2347
Diffstat (limited to 'db/migrate')
| -rw-r--r-- | db/migrate/20180223144945_add_allow_local_requests_from_hooks_and_services_to_application_settings.rb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/db/migrate/20180223144945_add_allow_local_requests_from_hooks_and_services_to_application_settings.rb b/db/migrate/20180223144945_add_allow_local_requests_from_hooks_and_services_to_application_settings.rb new file mode 100644 index 00000000000..c994a54698b --- /dev/null +++ b/db/migrate/20180223144945_add_allow_local_requests_from_hooks_and_services_to_application_settings.rb @@ -0,0 +1,18 @@ +class AddAllowLocalRequestsFromHooksAndServicesToApplicationSettings < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column_with_default(:application_settings, :allow_local_requests_from_hooks_and_services, + :boolean, + default: false, + allow_null: false) + end + + def down + remove_column(:application_settings, :allow_local_requests_from_hooks_and_services) + end +end |