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
07cc58d4
Commit
07cc58d4
authored
Jul 20, 2020
by
Robert Hunt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed the approval status to use GlLink rather than a direct a tag
parent
a7d02e19
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
ee/app/assets/javascripts/compliance_dashboard/components/approval_status.vue
...ripts/compliance_dashboard/components/approval_status.vue
+4
-3
ee/spec/frontend/compliance_dashboard/components/approval_status_spec.js
...d/compliance_dashboard/components/approval_status_spec.js
+2
-1
No files found.
ee/app/assets/javascripts/compliance_dashboard/components/approval_status.vue
View file @
07cc58d4
<
script
>
import
{
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
Gl
Link
,
Gl
TooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
s__
}
from
'
~/locale
'
;
import
CiIcon
from
'
~/vue_shared/components/ci_icon.vue
'
;
...
...
@@ -12,6 +12,7 @@ export default {
},
components
:
{
CiIcon
,
GlLink
,
},
props
:
{
status
:
{
...
...
@@ -45,9 +46,9 @@ export default {
</
script
>
<
template
>
<
a
<
gl-link
href=
"https://docs.gitlab.com/ee/user/compliance/compliance_dashboard/#approval-status-and-separation-of-duties"
>
<ci-icon
v-gl-tooltip.left=
"tooltip"
class=
"gl-display-flex"
:status=
"
{ icon, group }" />
</
a
>
</
gl-link
>
</
template
>
ee/spec/frontend/compliance_dashboard/components/approval_status_spec.js
View file @
07cc58d4
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
GlLink
}
from
'
@gitlab/ui
'
;
import
ApprovalStatus
from
'
ee/compliance_dashboard/components/approval_status.vue
'
;
...
...
@@ -6,7 +7,7 @@ describe('ApprovalStatus component', () => {
let
wrapper
;
const
findIcon
=
()
=>
wrapper
.
find
(
'
.ci-icon
'
);
const
findLink
=
()
=>
wrapper
.
find
(
'
a
'
);
const
findLink
=
()
=>
wrapper
.
find
(
GlLink
);
const
createComponent
=
status
=>
{
return
shallowMount
(
ApprovalStatus
,
{
...
...
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