diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-13 18:36:47 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-13 18:36:47 +0000 |
| commit | 5e9666880376b3f53edb95cba77b5642d3cc1810 (patch) | |
| tree | c41d0997dbfa7211d3f66ffd0cf3cc2b88d7221e /app/controllers | |
| parent | b35378a938e22f745b6c6ea32b53cb50f9b6c627 (diff) | |
| parent | 9493791d1212f484217e74757550353a5ef07dcf (diff) | |
| download | gitlab-ce-5e9666880376b3f53edb95cba77b5642d3cc1810.tar.gz | |
Merge branch 'option-to-be-notified-of-own-activity' into 'master'
Add option to receive email notifications about your own activity
See merge request !8836
Diffstat (limited to 'app/controllers')
| -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 |