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
5f9d0084
Commit
5f9d0084
authored
Jan 26, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust aligment for the icons
parent
eaca44e2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
44 deletions
+20
-44
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+6
-11
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_report_collapsible_section.vue
...idget/components/mr_widget_report_collapsible_section.vue
+1
-1
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_report_issues.vue
...rge_request_widget/components/mr_widget_report_issues.vue
+11
-7
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
...javascripts/vue_merge_request_widget/mr_widget_options.js
+2
-25
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
5f9d0084
...
...
@@ -785,10 +785,6 @@
}
.mr-widget-code-quality
{
.ci-status-icon-warning
svg
{
fill
:
$theme-gray-600
;
}
.code-quality-container
{
border-top
:
1px
solid
$gray-darker
;
padding
:
$gl-padding-top
;
...
...
@@ -805,10 +801,14 @@
.mr-widget-code-quality-list
{
list-style
:
none
;
padding
:
0
12
px
;
padding
:
0
9
px
;
margin
:
0
;
line-height
:
$code_line_height
;
.mr-widget-code-quality-list-item
{
display
:
flex
;
}
.failed
.mr-widget-code-quality-icon
{
color
:
$red-500
;
}
...
...
@@ -822,13 +822,8 @@
}
.mr-widget-code-quality-icon
{
margin
-right
:
12px
;
margin
:
3px
12px
0
0
;
fill
:
currentColor
;
svg
{
width
:
10px
;
height
:
10px
;
}
}
}
}
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_report_collapsible_section.vue
View file @
5f9d0084
<
script
>
/* eslint-disable vue/require-default-prop */
import
{
__
}
from
'
~/locale
'
;
import
statusIcon
from
'
~/vue_merge_request_widget/components/mr_widget_status_icon.vue
'
;
import
loadingIcon
from
'
~/vue_shared/components/loading_icon.vue
'
;
import
issuesBlock
from
'
./mr_widget_report_issues.vue
'
;
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_report_issues.vue
View file @
5f9d0084
...
...
@@ -45,6 +45,15 @@
fixedLabel
()
{
return
s__
(
'
ciReport|Fixed:
'
);
},
iconName
()
{
if
(
this
.
isStatusFailed
)
{
return
'
status_failed_borderless
'
;
}
else
if
(
this
.
isStatusSuccess
)
{
return
'
status_success_borderless
'
;
}
return
'
status_created_borderless
'
;
},
isStatusFailed
()
{
return
this
.
status
===
'
failed
'
;
},
...
...
@@ -109,18 +118,13 @@
success: isStatusSuccess,
neutral: isStatusNeutral
}"
class="mr-widget-code-quality-list-item"
v-for="(issue, index) in issues"
:key="index"
>
<icon
class=
"mr-widget-code-quality-icon"
v-if=
"isStatusSuccess"
name=
"status_success_borderless"
/>
<icon
v-else
class=
"mr-widget-code-quality-icon"
name=
"status_failed_borderless"
:name=
"iconName"
/>
<template
v-if=
"isStatusSuccess && isTypeQuality"
>
{{
fixedLabel
}}
</
template
>
...
...
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
View file @
5f9d0084
...
...
@@ -41,7 +41,6 @@ export default {
return
this
.
mr
.
sast
;
},
shouldRenderDockerReport
()
{
return
true
;
return
this
.
mr
.
sastContainer
;
},
shouldRenderDastReport
()
{
...
...
@@ -312,31 +311,9 @@ export default {
if
(
this
.
shouldRenderSecurityReport
)
{
this
.
fetchSecurity
();
}
this
.
mr
.
setDockerReport
({
unapproved
:
[
'
CVE-2017-12944
'
,
'
CVE-2017-16232
'
],
vulnerabilities
:
[
{
vulnerability
:
'
CVE-2017-12944
'
,
namespace
:
'
debian:8
'
,
severity
:
'
Medium
'
},
{
vulnerability
:
'
CVE-2017-16232
'
,
namespace
:
'
debian:8
'
,
severity
:
'
Negligible
'
},
{
vulnerability
:
'
CVE-2014-8130
'
,
namespace
:
'
debian:8
'
,
severity
:
'
Negligible
'
}
]
});
if
(
this
.
shouldRenderDockerReport
)
{
//
this.fetchDockerReport();
this
.
fetchDockerReport
();
}
if
(
this
.
shouldRenderDastReport
)
{
...
...
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