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:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-11-02 15:11:04 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-11-02 15:11:04 +0300
commited509186782d16d2bbcb34ac73303e8cb3a9d5a2 (patch)
tree4ab3bbb33b37e9e4c0f73627617ea6b0c7d0d7f7 /app/models/integrations
parent44837830832a41a6fe6360aca18e50826c723fd1 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/integrations')
-rw-r--r--app/models/integrations/jira.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/integrations/jira.rb b/app/models/integrations/jira.rb
index 25644dcf83b..30497c0110e 100644
--- a/app/models/integrations/jira.rb
+++ b/app/models/integrations/jira.rb
@@ -532,13 +532,14 @@ module Integrations
end
def build_entity_meta(entity)
- if entity.is_a?(Commit)
+ case entity
+ when Commit
{
id: entity.short_id,
description: entity.safe_message,
branch: branch_name(entity)
}
- elsif entity.is_a?(MergeRequest)
+ when MergeRequest
{
id: entity.to_reference,
branch: entity.source_branch