diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-02-02 17:16:21 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-02-08 12:21:32 -0200 |
| commit | 7f973ccbc314dd0ce012c730f1e6f226be5c343b (patch) | |
| tree | 339fc92d7a1fc443923eb6f0a954bfe55a208f78 | |
| parent | 4615d0995117e8369acc7b1f5f2b8497426ba5c7 (diff) | |
| download | gitlab-ce-7f973ccbc314dd0ce012c730f1e6f226be5c343b.tar.gz | |
Remove JIRA closed status iconissue_26701
| -rw-r--r-- | app/models/project_services/jira_service.rb | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/issue_26701.yml | 4 | ||||
| -rw-r--r-- | spec/models/project_services/jira_service_spec.rb | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 80d002f9c32..eef403dba92 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -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: { diff --git a/changelogs/unreleased/issue_26701.yml b/changelogs/unreleased/issue_26701.yml new file mode 100644 index 00000000000..6834351bf43 --- /dev/null +++ b/changelogs/unreleased/issue_26701.yml @@ -0,0 +1,4 @@ +--- +title: Remove JIRA closed status icon +merge_request: +author: diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb index 2f6b159d76e..4bca0229e7a 100644 --- a/spec/models/project_services/jira_service_spec.rb +++ b/spec/models/project_services/jira_service_spec.rb @@ -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 |