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
bc88c631
Commit
bc88c631
authored
Jan 22, 2020
by
Dheeraj Joshi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix outdated MR security warning
parent
c1fc94ae
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
4 deletions
+13
-4
changelogs/unreleased/avoid-using-gl-object.yml
changelogs/unreleased/avoid-using-gl-object.yml
+5
-0
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
...avascripts/vue_merge_request_widget/mr_widget_options.vue
+1
-0
ee/app/assets/javascripts/vue_shared/security_reports/grouped_security_reports_app.vue
..._shared/security_reports/grouped_security_reports_app.vue
+6
-4
ee/spec/frontend/vue_shared/security_reports/grouped_security_reports_app_spec.js
...red/security_reports/grouped_security_reports_app_spec.js
+1
-0
No files found.
changelogs/unreleased/avoid-using-gl-object.yml
0 → 100644
View file @
bc88c631
---
title
:
Fix outdated MR security warning message
merge_request
:
23496
author
:
type
:
fixed
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @
bc88c631
...
@@ -318,6 +318,7 @@ export default {
...
@@ -318,6 +318,7 @@ export default {
:can-create-issue=
"mr.canCreateIssue"
:can-create-issue=
"mr.canCreateIssue"
:can-create-merge-request=
"mr.canCreateMergeRequest"
:can-create-merge-request=
"mr.canCreateMergeRequest"
:can-dismiss-vulnerability=
"mr.canDismissVulnerability"
:can-dismiss-vulnerability=
"mr.canDismissVulnerability"
:diverged-commits-count=
"mr.divergedCommitsCount"
/>
/>
<mr-widget-licenses
<mr-widget-licenses
v-if=
"shouldRenderLicenseReport"
v-if=
"shouldRenderLicenseReport"
...
...
ee/app/assets/javascripts/vue_shared/security_reports/grouped_security_reports_app.vue
View file @
bc88c631
...
@@ -113,6 +113,11 @@ export default {
...
@@ -113,6 +113,11 @@ export default {
type
:
Boolean
,
type
:
Boolean
,
required
:
true
,
required
:
true
,
},
},
divergedCommitsCount
:
{
type
:
Number
,
required
:
false
,
default
:
0
,
},
},
},
componentNames
,
componentNames
,
computed
:
{
computed
:
{
...
@@ -154,10 +159,7 @@ export default {
...
@@ -154,10 +159,7 @@ export default {
return
this
.
enabledReports
.
sast
;
return
this
.
enabledReports
.
sast
;
},
},
subHeadingText
()
{
subHeadingText
()
{
const
mrDivergedCommitsCount
=
const
isMRBranchOutdated
=
this
.
divergedCommitsCount
>
0
;
(
gl
&&
gl
.
mrWidgetData
&&
gl
.
mrWidgetData
.
diverged_commits_count
)
||
0
;
const
isMRBranchOutdated
=
mrDivergedCommitsCount
>
0
;
if
(
isMRBranchOutdated
)
{
if
(
isMRBranchOutdated
)
{
return
sprintf
(
return
sprintf
(
s__
(
s__
(
...
...
ee/spec/frontend/vue_shared/security_reports/grouped_security_reports_app_spec.js
View file @
bc88c631
...
@@ -352,6 +352,7 @@ describe('Grouped security reports app', () => {
...
@@ -352,6 +352,7 @@ describe('Grouped security reports app', () => {
createWrapper
({
createWrapper
({
...
props
,
...
props
,
divergedCommitsCount
:
1
,
targetBranch
:
'
master
'
,
targetBranch
:
'
master
'
,
enabledReports
:
{
enabledReports
:
{
sast
:
true
,
sast
:
true
,
...
...
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