From 6081c1224414da0b6bf033c14a2b7c4dff3c0b5d Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 17 Oct 2023 12:10:51 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/models/integrations/jira.rb            | 4 ++++
 app/models/work_items/widgets/hierarchy.rb | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'app/models')

diff --git a/app/models/integrations/jira.rb b/app/models/integrations/jira.rb
index a08f826ed23..f6e99454cb1 100644
--- a/app/models/integrations/jira.rb
+++ b/app/models/integrations/jira.rb
@@ -394,6 +394,10 @@ module Integrations
       jira_auth_type == AUTH_TYPE_PAT
     end
 
+    def avatar_url
+      ActionController::Base.helpers.image_path('illustrations/third-party-logos/integrations-logos/jira.svg')
+    end
+
     private
 
     def jira_issue_match_regex
diff --git a/app/models/work_items/widgets/hierarchy.rb b/app/models/work_items/widgets/hierarchy.rb
index 9d90a56d59e..fc6714f1e08 100644
--- a/app/models/work_items/widgets/hierarchy.rb
+++ b/app/models/work_items/widgets/hierarchy.rb
@@ -11,6 +11,10 @@ module WorkItems
         work_item.work_item_children_by_relative_position
       end
 
+      def ancestors
+        work_item.ancestors
+      end
+
       def self.quick_action_commands
         [:set_parent, :add_child]
       end
-- 
cgit v1.2.3