Skip to content
Snippets Groups Projects
Commit 110cd589 authored by Sean McGivern's avatar Sean McGivern
Browse files

Merge branch 'issue_26701' into 'master'

Remove JIRA closed status icon

Closes #26701

See merge request !8944
parents 091874da 7f973ccb
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -250,21 +250,11 @@ class JiraService < IssueTrackerService
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)
status = {
resolved: resolved
}
 
if resolved
status[:icon] = {
title: 'Closed',
url16x16: 'http://www.openwebgraphics.com/resources/data/1768/16x16_apply.png'
}
end
{
GlobalID: 'GitLab',
object: {
Loading
Loading
---
title: Remove JIRA closed status icon
merge_request:
author:
Loading
Loading
@@ -135,7 +135,7 @@ describe JiraService, models: true do
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}.",
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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment