diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-25 11:27:58 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-25 11:27:58 +0000 |
| commit | 2a067bb37cdd4b00abf742c4e221397ee86dcf0c (patch) | |
| tree | 5d69fb595752c8a29563747a13ef28b9b057d188 /app/controllers/admin | |
| parent | bd13978c71a2bcc803135c0c0a0f1e5cd3e70c18 (diff) | |
| parent | e4391c7190fcebd37e49db447b22b1081dca9741 (diff) | |
| download | gitlab-ce-2a067bb37cdd4b00abf742c4e221397ee86dcf0c.tar.gz | |
Merge branch 'backport-ee-2328' into 'master'
Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328
See merge request !13022
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index c1bc4c0d675..4c0f7556894 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -76,11 +76,11 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController params.delete(:domain_blacklist_raw) if params[:domain_blacklist_file] params.require(:application_setting).permit( - application_setting_params_ce + application_setting_params_attributes ) end - def application_setting_params_ce + def application_setting_params_attributes [ :admin_notification_email, :after_sign_out_path, |