Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
110cd589
Commit
110cd589
authored
Feb 09, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue_26701' into 'master'
Remove JIRA closed status icon Closes #26701 See merge request !8944
parents
091874da
7f973ccb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
11 deletions
+5
-11
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+0
-10
changelogs/unreleased/issue_26701.yml
changelogs/unreleased/issue_26701.yml
+4
-0
spec/models/project_services/jira_service_spec.rb
spec/models/project_services/jira_service_spec.rb
+1
-1
No files found.
app/models/project_services/jira_service.rb
View file @
110cd589
...
@@ -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:
{
...
...
changelogs/unreleased/issue_26701.yml
0 → 100644
View file @
110cd589
---
title
:
Remove JIRA closed status icon
merge_request
:
author
:
spec/models/project_services/jira_service_spec.rb
View file @
110cd589
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment