From 891529770382ed0591209570567f17605524ef39 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 28 Dec 2022 18:07:22 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/chat_name.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/models/chat_name.rb') diff --git a/app/models/chat_name.rb b/app/models/chat_name.rb index 60370c525d5..5996e15df4e 100644 --- a/app/models/chat_name.rb +++ b/app/models/chat_name.rb @@ -11,8 +11,7 @@ class ChatName < ApplicationRecord validates :team_id, presence: true validates :chat_id, presence: true - validates :user_id, uniqueness: { scope: [:integration_id] } - validates :chat_id, uniqueness: { scope: [:integration_id, :team_id] } + validates :chat_id, uniqueness: { scope: :team_id } # Updates the "last_used_timestamp" but only if it wasn't already updated # recently. -- cgit v1.2.3