diff options
author | Rémy Coutable <remy@rymai.me> | 2016-11-17 18:08:24 +0000 |
---|---|---|
committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2016-11-18 21:26:15 +0000 |
commit | 34528a42cb77ebf2b978c17720a9e38c95b21774 (patch) | |
tree | 3a6caff5b3608aeacc67a89a578c78834d0da1ef /app/models | |
parent | aab64bd5a8b9fc2f12e30f3b633ae1b584472e8c (diff) | |
download | gitlab-ce-34528a42cb77ebf2b978c17720a9e38c95b21774.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')
-rw-r--r-- | app/models/chat_name.rb | 12 | ||||
-rw-r--r-- | app/models/user.rb | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/app/models/chat_name.rb b/app/models/chat_name.rb new file mode 100644 index 00000000000..f321db75eeb --- /dev/null +++ b/app/models/chat_name.rb @@ -0,0 +1,12 @@ +class ChatName < ActiveRecord::Base + belongs_to :service + belongs_to :user + + validates :user, presence: true + validates :service, presence: true + validates :team_id, presence: true + validates :chat_id, presence: true + + validates :user_id, uniqueness: { scope: [:service_id] } + validates :chat_id, uniqueness: { scope: [:service_id, :team_id] } +end diff --git a/app/models/user.rb b/app/models/user.rb index c405321127b..c7f15f54f90 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 |