diff options
author | Robert Speicher <robert@gitlab.com> | 2017-03-27 15:55:47 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-03-27 15:55:47 +0000 |
commit | aeff506a4ea247bd912de967e43dd34dd5fad453 (patch) | |
tree | 15b7747d3cc8ce1a9788a43c39252feb97738796 /app/models/user.rb | |
parent | 8bddf23e60459703b60d1c034ca155d5cd0e7536 (diff) | |
parent | c8ad3346b0d5575faab49f247192f58c92e1ce72 (diff) | |
download | gitlab-ce-aeff506a4ea247bd912de967e43dd34dd5fad453.tar.gz |
Merge branch 'sh-bring-back-option-to-be-notified-of-own-activity' into 'master'
Bring back option to be notified of own activity
See merge request !10032
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 612066654dc..cbd741f96ed 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -22,6 +22,7 @@ class User < ActiveRecord::Base default_value_for :hide_no_ssh_key, false default_value_for :hide_no_password, false default_value_for :project_view, :files + default_value_for :notified_of_own_activity, false attr_encrypted :otp_secret, key: Gitlab::Application.secrets.otp_key_base, |