diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 18:06:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 18:06:21 +0000 |
| commit | 6d59e989185a7d2645792b713d1b5d95d46651fd (patch) | |
| tree | f89d869a6c557a3e6e0b9305290259ab1d6fb589 /app/controllers/notification_settings_controller.rb | |
| parent | 5c521d1f9b1e389e2f9b2b5fccf3798159a10f8d (diff) | |
| download | gitlab-ce-6d59e989185a7d2645792b713d1b5d95d46651fd.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/notification_settings_controller.rb')
| -rw-r--r-- | app/controllers/notification_settings_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/notification_settings_controller.rb b/app/controllers/notification_settings_controller.rb index 43c4f4d220e..c97fec0a6ee 100644 --- a/app/controllers/notification_settings_controller.rb +++ b/app/controllers/notification_settings_controller.rb @@ -50,8 +50,6 @@ class NotificationSettingsController < ApplicationController end def notification_setting_params_for(source) - allowed_fields = NotificationSetting.email_events(source).dup - allowed_fields << :level - params.require(:notification_setting).permit(allowed_fields) + params.require(:notification_setting).permit(NotificationSetting.allowed_fields(source)) end end |