diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-17 15:10:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-17 15:10:51 +0300 |
| commit | 6081c1224414da0b6bf033c14a2b7c4dff3c0b5d (patch) | |
| tree | 9e6a1053aaef754fdc712f1b203621ec0b3f82c4 /app/models | |
| parent | 550096a3bf94b5d8e2b74dc8f94fbb0c579a7313 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/integrations/jira.rb | 4 | ||||
| -rw-r--r-- | app/models/work_items/widgets/hierarchy.rb | 4 |
2 files changed, 8 insertions, 0 deletions
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 |