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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
098fbac7
Commit
098fbac7
authored
Feb 16, 2021
by
Savas Vedova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add external link to create jira issue button
- Add changelog
parent
7c9add3b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletion
+18
-1
ee/app/assets/javascripts/vue_shared/security_reports/components/modal_footer.vue
...s/vue_shared/security_reports/components/modal_footer.vue
+8
-1
ee/changelogs/unreleased/289815-add-external-icon.yml
ee/changelogs/unreleased/289815-add-external-icon.yml
+5
-0
ee/spec/frontend/vue_shared/security_reports/components/modal_footer_spec.js
...e_shared/security_reports/components/modal_footer_spec.js
+5
-0
No files found.
ee/app/assets/javascripts/vue_shared/security_reports/components/modal_footer.vue
View file @
098fbac7
<
script
>
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
DismissButton
from
'
ee/vue_shared/security_reports/components/dismiss_button.vue
'
;
import
SplitButton
from
'
ee/vue_shared/security_reports/components/split_button.vue
'
;
import
{
s__
}
from
'
~/locale
'
;
...
...
@@ -9,6 +9,7 @@ export default {
DismissButton
,
GlButton
,
SplitButton
,
GlIcon
,
},
props
:
{
modal
:
{
...
...
@@ -77,6 +78,7 @@ export default {
isLoading
:
this
.
isCreatingIssue
,
action
:
this
.
vulnerability
.
create_jira_issue_url
?
undefined
:
'
createNewIssue
'
,
href
:
this
.
vulnerability
.
create_jira_issue_url
,
icon
:
this
.
vulnerability
.
create_jira_issue_url
?
'
external-link
'
:
undefined
,
};
const
MRButton
=
{
name
:
s__
(
'
ciReport|Resolve with merge request
'
),
...
...
@@ -147,6 +149,11 @@ export default {
:href=
"actionButtons[0].href"
@
click=
"$emit(actionButtons[0].action)"
>
<gl-icon
v-if=
"actionButtons[0].icon"
:name=
"actionButtons[0].icon"
class=
"gl-vertical-align-middle"
/>
{{
__
(
actionButtons
[
0
].
name
)
}}
</gl-button>
</div>
...
...
ee/changelogs/unreleased/289815-add-external-icon.yml
0 → 100644
View file @
098fbac7
---
title
:
Add external link to create jira issue button
merge_request
:
54310
author
:
type
:
changed
ee/spec/frontend/vue_shared/security_reports/components/modal_footer_spec.js
View file @
098fbac7
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
mount
}
from
'
@vue/test-utils
'
;
import
DismissButton
from
'
ee/vue_shared/security_reports/components/dismiss_button.vue
'
;
import
component
from
'
ee/vue_shared/security_reports/components/modal_footer.vue
'
;
...
...
@@ -74,6 +75,10 @@ describe('Security Reports modal footer', () => {
it
(
'
has the correct text
'
,
()
=>
{
expect
(
findActionButton
().
text
()).
toBe
(
'
Create Jira issue
'
);
});
it
(
'
has the external-link icon
'
,
()
=>
{
expect
(
findActionButton
().
find
(
GlIcon
).
props
(
'
name
'
)).
toBe
(
'
external-link
'
);
});
});
describe
(
'
can only create merge request
'
,
()
=>
{
...
...
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