diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-17 18:08:24 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-17 18:08:24 +0000 |
| commit | 726a414169e6c3219ff4fd410da3efd53fc7f912 (patch) | |
| tree | b3cb53c9bb0724aacbf2181911b2157c5abef67a /app/models/user.rb | |
| parent | e96ee2a22ba56a77fcec371313e25d3b3c93cff2 (diff) | |
| parent | d444fd3460e896065c21abda9a1cafa93f9315a5 (diff) | |
| download | gitlab-ce-726a414169e6c3219ff4fd410da3efd53fc7f912.tar.gz | |
Merge branch 'chat-name-authorize' into 'master'
Allows to authorize chat user against GitLab.
This is needed for: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7438
See merge request !7450
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 5a2b232c4ed..519ed92e28b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -56,6 +56,7 @@ class User < ActiveRecord::Base has_many :personal_access_tokens, dependent: :destroy has_many :identities, dependent: :destroy, autosave: true has_many :u2f_registrations, dependent: :destroy + has_many :chat_names, dependent: :destroy # Groups has_many :members, dependent: :destroy |