diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-03-16 20:18:57 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-03-16 20:18:57 -0700 |
| commit | 7cad597f6c8ba794c6852e23d718ed7827da35c6 (patch) | |
| tree | a81a2f320f35a546b5a6d7a1b54015877d53c0ff /app/controllers/profiles | |
| parent | 4bf4612cfbe73845391375bf721592426d7b4181 (diff) | |
| download | gitlab-ce-7cad597f6c8ba794c6852e23d718ed7827da35c6.tar.gz | |
Revert "Merge branch '8836-mr-revert' into 'master'
This reverts commit 68e40bd49fde7b790bb31b9ac85a249bedd817d2, reversing
changes made to 2d1f823b4c8b60cee525384cb52e547d2be8925a.
Diffstat (limited to 'app/controllers/profiles')
| -rw-r--r-- | app/controllers/profiles/notifications_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb index b8b71d295f6..a271e2dfc4b 100644 --- a/app/controllers/profiles/notifications_controller.rb +++ b/app/controllers/profiles/notifications_controller.rb @@ -17,6 +17,6 @@ class Profiles::NotificationsController < Profiles::ApplicationController end def user_params - params.require(:user).permit(:notification_email) + params.require(:user).permit(:notification_email, :notified_of_own_activity) end end |