diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-03-15 11:50:20 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-03-15 11:51:08 -0700 |
| commit | 203bb0bc546cfa99272a858426904030d9292615 (patch) | |
| tree | 18f68a88f9225b054e96992040bb69ddf09b0400 /app/controllers/profiles/notifications_controller.rb | |
| parent | ba9ea195f87a99ffa2662c8f273599f16dca4478 (diff) | |
| download | gitlab-ce-203bb0bc546cfa99272a858426904030d9292615.tar.gz | |
Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'
This reverts commit 5e9666880376b3f53edb95cba77b5642d3cc1810, reversing
changes made to b35378a938e22f745b6c6ea32b53cb50f9b6c627.
Diffstat (limited to 'app/controllers/profiles/notifications_controller.rb')
| -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 a271e2dfc4b..b8b71d295f6 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, :notified_of_own_activity) + params.require(:user).permit(:notification_email) end end |