Commit 4e20d711 authored by Filipa Lacerda's avatar Filipa Lacerda

Fix eslint errors after conflict resolution

parent b7f9dd42
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
{{ actionText }} {{ actionText }}
<mr-widget-author :author="author" /> <mr-widget-author :author="author" />
<time <time
:title="dateTitle"
v-tooltip v-tooltip
:title="dateTitle"
data-container="body" data-container="body"
> >
{{ dateReadable }} {{ dateReadable }}
......
...@@ -177,8 +177,8 @@ export default { ...@@ -177,8 +177,8 @@ export default {
</span> </span>
</div> </div>
<div <div
class="well-segment flex js-sast-container-summary"
v-if="hasSastContainer" v-if="hasSastContainer"
class="well-segment flex js-sast-container-summary"
> >
<loading-icon <loading-icon
v-if="isLoadingSastContainer" v-if="isLoadingSastContainer"
...@@ -211,8 +211,8 @@ export default { ...@@ -211,8 +211,8 @@ export default {
</span> </span>
</div> </div>
<div <div
class="well-segment flex js-dast-summary"
v-if="hasDast" v-if="hasDast"
class="well-segment flex js-dast-summary"
> >
<loading-icon <loading-icon
v-if="isLoadingDast" v-if="isLoadingDast"
......
...@@ -28,10 +28,10 @@ export default { ...@@ -28,10 +28,10 @@ export default {
Merge requests are read-only in a secondary Geo node Merge requests are read-only in a secondary Geo node
</span> </span>
<a <a
v-tooltip
:href="mr.geoSecondaryHelpPath" :href="mr.geoSecondaryHelpPath"
:title="__('About this feature')" :title="__('About this feature')"
data-placement="bottom" data-placement="bottom"
v-tooltip
target="_blank" target="_blank"
rel="noopener noreferrer nofollow" rel="noopener noreferrer nofollow"
data-container="body" data-container="body"
......
...@@ -224,7 +224,6 @@ export default { ...@@ -224,7 +224,6 @@ export default {
<report-section <report-section
v-if="sastContainerHeadPath" v-if="sastContainerHeadPath"
class="js-dependency-scanning-widget split-report-section"
:type="$options.sastContainer" :type="$options.sastContainer"
:status="checkReportStatus(sastContainer.isLoading, sastContainer.hasError)" :status="checkReportStatus(sastContainer.isLoading, sastContainer.hasError)"
:loading-text="translateText('Container scanning').loading" :loading-text="translateText('Container scanning').loading"
...@@ -233,11 +232,11 @@ export default { ...@@ -233,11 +232,11 @@ export default {
:unresolved-issues="sastContainer.newIssues" :unresolved-issues="sastContainer.newIssues"
:has-issues="sastContainer.newIssues.length > 0" :has-issues="sastContainer.newIssues.length > 0"
:popover-options="sastContainerPopover" :popover-options="sastContainerPopover"
class="js-dependency-scanning-widget split-report-section"
/> />
<report-section <report-section
v-if="dastHeadPath" v-if="dastHeadPath"
class="js-dast-widget split-report-section"
:type="$options.dast" :type="$options.dast"
:status="checkReportStatus(dast.isLoading, dast.hasError)" :status="checkReportStatus(dast.isLoading, dast.hasError)"
:loading-text="translateText('DAST').loading" :loading-text="translateText('DAST').loading"
...@@ -246,6 +245,7 @@ export default { ...@@ -246,6 +245,7 @@ export default {
:unresolved-issues="dast.newIssues" :unresolved-issues="dast.newIssues"
:has-issues="dast.newIssues.length > 0" :has-issues="dast.newIssues.length > 0"
:popover-options="dastPopover" :popover-options="dastPopover"
class="js-dast-widget split-report-section"
/> />
<issue-modal /> <issue-modal />
......
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