diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-13 06:09:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-13 06:09:28 +0300 |
commit | 0faed4500e806f0f27cb33349bf5ecaee4cca98d (patch) | |
tree | 77aa09778f3227f48ed1ecd4f7c0ceb0e195898d /app/models/integrations | |
parent | 50a75eed991f16055c82df0a00e6d7ffdbd64796 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/integrations')
-rw-r--r-- | app/models/integrations/base_slash_commands.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/integrations/base_slash_commands.rb b/app/models/integrations/base_slash_commands.rb index a0ac5474893..e51d748b562 100644 --- a/app/models/integrations/base_slash_commands.rb +++ b/app/models/integrations/base_slash_commands.rb @@ -8,7 +8,7 @@ module Integrations prop_accessor :token - has_many :chat_names, foreign_key: :service_id, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent + has_many :chat_names, foreign_key: :integration_id, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent def valid_token?(token) self.respond_to?(:token) && |