Commit 110cd589 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'issue_26701' into 'master'

Remove JIRA closed status icon

Closes #26701

See merge request !8944
parents 091874da 7f973ccb
...@@ -250,21 +250,11 @@ class JiraService < IssueTrackerService ...@@ -250,21 +250,11 @@ class JiraService < IssueTrackerService
end end
end end
# Build remote link on JIRA properties
# Icons here must be available on WEB so JIRA can read the URL
# We are using a open word graphics icon which have LGPL license
def build_remote_link_props(url:, title:, resolved: false) def build_remote_link_props(url:, title:, resolved: false)
status = { status = {
resolved: resolved resolved: resolved
} }
if resolved
status[:icon] = {
title: 'Closed',
url16x16: 'http://www.openwebgraphics.com/resources/data/1768/16x16_apply.png'
}
end
{ {
GlobalID: 'GitLab', GlobalID: 'GitLab',
object: { object: {
......
---
title: Remove JIRA closed status icon
merge_request:
author:
...@@ -135,7 +135,7 @@ describe JiraService, models: true do ...@@ -135,7 +135,7 @@ describe JiraService, models: true do
url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/#{merge_request.diff_head_sha}", url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/#{merge_request.diff_head_sha}",
title: "GitLab: Solved by commit #{merge_request.diff_head_sha}.", title: "GitLab: Solved by commit #{merge_request.diff_head_sha}.",
icon: { title: "GitLab", url16x16: "https://gitlab.com/favicon.ico" }, icon: { title: "GitLab", url16x16: "https://gitlab.com/favicon.ico" },
status: { resolved: true, icon: { url16x16: "http://www.openwebgraphics.com/resources/data/1768/16x16_apply.png", title: "Closed" } } status: { resolved: true }
} }
) )
).once ).once
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment