diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-01 18:21:24 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-01 18:21:24 +0300 |
| commit | 83a0db0c551236518bdec1a7ae3a1ed1d05f5aaa (patch) | |
| tree | e13ad022ea223e7bde5202a31ee81169225fec99 /app/models/user.rb | |
| parent | ea6fc714bb0306ac8ca56b5dafe4b6777aafe5fc (diff) | |
| parent | 12095251c3777c5231cab97854d5dca69d31cc5d (diff) | |
Merge branch 'bvl-user-status-message-35463' into 'master'
Allow users to set a status
Closes #35463
See merge request gitlab-org/gitlab-ce!20614
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 03549872924..31b49b9bf2a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -141,6 +141,8 @@ class User < ActiveRecord::Base has_many :term_agreements belongs_to :accepted_term, class_name: 'ApplicationSetting::Term' + has_one :status, class_name: 'UserStatus' + # # Validations # |