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
4e20d711
Commit
4e20d711
authored
Jun 13, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix eslint errors after conflict resolution
parent
b7f9dd42
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue
...merge_request_widget/components/mr_widget_author_time.vue
+1
-1
ee/app/assets/javascripts/pipelines/components/security_reports/report_summary_widget.vue
...nes/components/security_reports/report_summary_widget.vue
+2
-2
ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_secondary_geo_node.vue
...widget/components/states/mr_widget_secondary_geo_node.vue
+1
-1
ee/app/assets/javascripts/vue_shared/security_reports/split_security_reports_app.vue
...ue_shared/security_reports/split_security_reports_app.vue
+2
-2
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue
View file @
4e20d711
...
@@ -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
}}
...
...
ee/app/assets/javascripts/pipelines/components/security_reports/report_summary_widget.vue
View file @
4e20d711
...
@@ -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"
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_secondary_geo_node.vue
View file @
4e20d711
...
@@ -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"
...
...
ee/app/assets/javascripts/vue_shared/security_reports/split_security_reports_app.vue
View file @
4e20d711
...
@@ -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
/>
...
...
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