Commit 968b8186 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'avoid-using-gl-object' into 'master'

Fix outdated MR security warning message

See merge request gitlab-org/gitlab!23496
parents e07468f5 bc88c631
---
title: Fix outdated MR security warning message
merge_request: 23496
author:
type: fixed
...@@ -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"
......
...@@ -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__(
......
...@@ -354,6 +354,7 @@ describe('Grouped security reports app', () => { ...@@ -354,6 +354,7 @@ describe('Grouped security reports app', () => {
createWrapper({ createWrapper({
...props, ...props,
divergedCommitsCount: 1,
targetBranch: 'master', targetBranch: 'master',
enabledReports: { enabledReports: {
sast: true, sast: true,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment