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
eee61387
Commit
eee61387
authored
Feb 15, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes broken modal in DAST report
parent
31be34d7
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
14 deletions
+30
-14
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+9
-0
changelogs/unreleased-ee/4944-dast-modal.yml
changelogs/unreleased-ee/4944-dast-modal.yml
+5
-0
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_dast_modal.vue
..._merge_request_widget/components/mr_widget_dast_modal.vue
+14
-13
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_report_issues.vue
...rge_request_widget/components/mr_widget_report_issues.vue
+2
-1
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
eee61387
...
@@ -805,10 +805,19 @@
...
@@ -805,10 +805,19 @@
margin
:
0
;
margin
:
0
;
line-height
:
$code_line_height
;
line-height
:
$code_line_height
;
.btn-open-modal
{
padding
:
0
5px
4px
;
}
.mr-widget-code-quality-list-item
{
.mr-widget-code-quality-list-item
{
display
:
flex
;
display
:
flex
;
}
}
.mr-widget-code-quality-list-item-modal
{
display
:
flex
;
flex-wrap
:
wrap
;
}
.failed
.mr-widget-code-quality-icon
{
.failed
.mr-widget-code-quality-icon
{
color
:
$red-500
;
color
:
$red-500
;
}
}
...
...
changelogs/unreleased-ee/4944-dast-modal.yml
0 → 100644
View file @
eee61387
---
title
:
Fix broken CSS in modal for DAST report
merge_request
:
author
:
type
:
fixed
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_dast_modal.vue
View file @
eee61387
<
script
>
<
script
>
import
{
s__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
spriteIcon
}
from
'
~/lib/utils/common_utils
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
e
xpandButton
from
'
~/vue_shared/components/expand_button.vue
'
;
import
E
xpandButton
from
'
~/vue_shared/components/expand_button.vue
'
;
export
default
{
export
default
{
name
:
'
ModalDast
'
,
name
:
'
ModalDast
'
,
components
:
{
components
:
{
expandButton
,
ExpandButton
,
Icon
,
},
},
props
:
{
props
:
{
title
:
{
title
:
{
...
@@ -27,13 +28,10 @@
...
@@ -27,13 +28,10 @@
instances
:
{
instances
:
{
type
:
Array
,
type
:
Array
,
required
:
false
,
required
:
false
,
default
:
()
=>
[]
,
default
:
()
=>
([])
,
},
},
},
},
computed
:
{
computed
:
{
cutIcon
()
{
return
spriteIcon
(
'
cut
'
);
},
instancesLabel
()
{
instancesLabel
()
{
return
s__
(
'
ciReport|Instances
'
);
return
s__
(
'
ciReport|Instances
'
);
},
},
...
@@ -54,7 +52,7 @@
...
@@ -54,7 +52,7 @@
role=
"dialog"
role=
"dialog"
>
>
<div
<div
class=
"modal-dialog"
class=
"modal-dialog
modal-lg
"
role=
"document"
role=
"document"
>
>
<div
class=
"modal-content"
>
<div
class=
"modal-content"
>
...
@@ -83,18 +81,21 @@
...
@@ -83,18 +81,21 @@
<li
<li
v-for=
"(instance, i) in instances"
v-for=
"(instance, i) in instances"
:key=
"i"
:key=
"i"
class=
"failed"
class=
"
mr-widget-code-quality-list-item-modal
failed"
>
>
<
spa
n
<
ico
n
class=
"mr-widget-code-quality-icon"
class=
"mr-widget-code-quality-icon"
v-html=
"cutIcon"
name=
"status_failed_borderless"
>
:size=
"32"
</span>
/>
{{
instance
.
method
}}
{{
instance
.
method
}}
<a
<a
:href=
"instance.uri"
:href=
"instance.uri"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferrer nofollow"
rel=
"noopener noreferrer nofollow"
class=
"prepend-left-5"
>
>
{{
instance
.
uri
}}
{{
instance
.
uri
}}
</a>
</a>
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_report_issues.vue
View file @
eee61387
...
@@ -143,6 +143,7 @@
...
@@ -143,6 +143,7 @@
:href=
"issue.nameLink"
:href=
"issue.nameLink"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferrer nofollow"
rel=
"noopener noreferrer nofollow"
class=
"prepend-left-5"
>
>
{{
issue
.
name
}}
{{
issue
.
name
}}
</a>
</a>
...
@@ -155,7 +156,7 @@
...
@@ -155,7 +156,7 @@
type=
"button"
type=
"button"
@
click=
"openDastModal(issue, index)"
@
click=
"openDastModal(issue, index)"
data-toggle=
"modal"
data-toggle=
"modal"
class=
"btn-link btn-blank"
class=
"btn-link btn-blank
btn-open-modal
"
:data-target=
"modalTargetId"
:data-target=
"modalTargetId"
>
>
{{
issue
.
name
}}
{{
issue
.
name
}}
...
...
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