Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/workers/integrations/group_mention_worker.rb')
-rw-r--r--app/workers/integrations/group_mention_worker.rb20
1 files changed, 10 insertions, 10 deletions
diff --git a/app/workers/integrations/group_mention_worker.rb b/app/workers/integrations/group_mention_worker.rb
index 6cde1657ccd..cbf70dc5c6a 100644
--- a/app/workers/integrations/group_mention_worker.rb
+++ b/app/workers/integrations/group_mention_worker.rb
@@ -22,19 +22,19 @@ module Integrations
mentionable = case mentionable_type
when 'Issue'
- Issue.find(mentionable_id)
+ Issue.find_by_id(mentionable_id)
when 'MergeRequest'
- MergeRequest.find(mentionable_id)
+ MergeRequest.find_by_id(mentionable_id)
+ else
+ Sidekiq.logger.error(
+ message: 'Integrations::GroupMentionWorker: mentionable not supported',
+ mentionable_type: mentionable_type,
+ mentionable_id: mentionable_id
+ )
+ nil
end
- if mentionable.nil?
- Sidekiq.logger.error(
- message: 'Integrations::GroupMentionWorker: mentionable not supported',
- mentionable_type: mentionable_type,
- mentionable_id: mentionable_id
- )
- return
- end
+ return if mentionable.nil?
Integrations::GroupMentionService.new(mentionable, hook_data: hook_data, is_confidential: is_confidential).execute
end