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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
b94a26ad
Commit
b94a26ad
authored
Oct 03, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use explicit boolean true attribute for show-disabled-button
Fix
https://gitlab.com/gitlab-org/gitlab-ce/issues/38417
parent
5a23af92
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
15 additions
and
10 deletions
+15
-10
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js
...ge_request_widget/components/states/mr_widget_checking.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
...e_request_widget/components/states/mr_widget_conflicts.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.js
...est_widget/components/states/mr_widget_failed_to_merge.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js
...uest_widget/components/states/mr_widget_missing_branch.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.js
...request_widget/components/states/mr_widget_not_allowed.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js
...st_widget/components/states/mr_widget_pipeline_blocked.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js
...est_widget/components/states/mr_widget_pipeline_failed.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js
...equest_widget/components/states/mr_widget_sha_mismatch.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
...get/components/states/mr_widget_unresolved_discussions.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
...e_merge_request_widget/components/states/mr_widget_wip.js
+1
-1
changelogs/unreleased/38417-use-explicit-boolean-vue-attribute.yml
...s/unreleased/38417-use-explicit-boolean-vue-attribute.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.js
View file @
b94a26ad
...
@@ -7,7 +7,7 @@ export default {
...
@@ -7,7 +7,7 @@ export default {
},
},
template
:
`
template
:
`
<div class="mr-widget-body media">
<div class="mr-widget-body media">
<status-icon status="loading"
showDisabledButton
/>
<status-icon status="loading"
:show-disabled-button="true"
/>
<div class="media-body space-children">
<div class="media-body space-children">
<span class="bold">
<span class="bold">
Checking ability to merge automatically
Checking ability to merge automatically
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
View file @
b94a26ad
...
@@ -12,7 +12,7 @@ export default {
...
@@ -12,7 +12,7 @@ export default {
<div class="mr-widget-body media">
<div class="mr-widget-body media">
<status-icon
<status-icon
status="failed"
status="failed"
showDisabledButton
/>
:show-disabled-button="true"
/>
<div class="media-body space-children">
<div class="media-body space-children">
<span
<span
v-if="mr.shouldBeRebased"
v-if="mr.shouldBeRebased"
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.js
View file @
b94a26ad
...
@@ -51,7 +51,7 @@ export default {
...
@@ -51,7 +51,7 @@ export default {
</span>
</span>
</template>
</template>
<template v-else>
<template v-else>
<status-icon status="failed"
showDisabledButton
/>
<status-icon status="failed"
:show-disabled-button="true"
/>
<div class="media-body space-children">
<div class="media-body space-children">
<span class="bold">
<span class="bold">
<span
<span
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js
View file @
b94a26ad
...
@@ -24,7 +24,7 @@ export default {
...
@@ -24,7 +24,7 @@ export default {
},
},
template
:
`
template
:
`
<div class="mr-widget-body media">
<div class="mr-widget-body media">
<status-icon status="failed"
showDisabledButton
/>
<status-icon status="failed"
:show-disabled-button="true"
/>
<div class="media-body space-children">
<div class="media-body space-children">
<span class="bold js-branch-text">
<span class="bold js-branch-text">
<span class="capitalize">
<span class="capitalize">
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.js
View file @
b94a26ad
...
@@ -7,7 +7,7 @@ export default {
...
@@ -7,7 +7,7 @@ export default {
},
},
template
:
`
template
:
`
<div class="mr-widget-body media">
<div class="mr-widget-body media">
<status-icon status="success"
showDisabledButton
/>
<status-icon status="success"
:show-disabled-button="true"
/>
<div class="media-body space-children">
<div class="media-body space-children">
<span class="bold">
<span class="bold">
Ready to be merged automatically.
Ready to be merged automatically.
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js
View file @
b94a26ad
...
@@ -7,7 +7,7 @@ export default {
...
@@ -7,7 +7,7 @@ export default {
},
},
template
:
`
template
:
`
<div class="mr-widget-body media">
<div class="mr-widget-body media">
<status-icon status="failed"
showDisabledButton
/>
<status-icon status="failed"
:show-disabled-button="true"
/>
<div class="media-body space-children">
<div class="media-body space-children">
<span class="bold">
<span class="bold">
Pipeline blocked. The pipeline for this merge request requires a manual action to proceed
Pipeline blocked. The pipeline for this merge request requires a manual action to proceed
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js
View file @
b94a26ad
...
@@ -7,7 +7,7 @@ export default {
...
@@ -7,7 +7,7 @@ export default {
},
},
template
:
`
template
:
`
<div class="mr-widget-body media">
<div class="mr-widget-body media">
<status-icon status="failed"
showDisabledButton
/>
<status-icon status="failed"
:show-disabled-button="true"
/>
<div class="media-body space-children">
<div class="media-body space-children">
<span class="bold">
<span class="bold">
The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure
The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js
View file @
b94a26ad
...
@@ -7,7 +7,7 @@ export default {
...
@@ -7,7 +7,7 @@ export default {
},
},
template
:
`
template
:
`
<div class="mr-widget-body media">
<div class="mr-widget-body media">
<status-icon status="failed"
showDisabledButton
/>
<status-icon status="failed"
:show-disabled-button="true"
/>
<div class="media-body space-children">
<div class="media-body space-children">
<span class="bold">
<span class="bold">
The source branch HEAD has recently changed. Please reload the page and review the changes before merging
The source branch HEAD has recently changed. Please reload the page and review the changes before merging
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
View file @
b94a26ad
...
@@ -10,7 +10,7 @@ export default {
...
@@ -10,7 +10,7 @@ export default {
},
},
template
:
`
template
:
`
<div class="mr-widget-body media">
<div class="mr-widget-body media">
<status-icon status="failed"
showDisabledButton
/>
<status-icon status="failed"
:show-disabled-button="true"
/>
<div class="media-body space-children">
<div class="media-body space-children">
<span class="bold">
<span class="bold">
There are unresolved discussions. Please resolve these discussions
There are unresolved discussions. Please resolve these discussions
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
View file @
b94a26ad
...
@@ -38,7 +38,7 @@ export default {
...
@@ -38,7 +38,7 @@ export default {
},
},
template
:
`
template
:
`
<div class="mr-widget-body media">
<div class="mr-widget-body media">
<status-icon status="failed" :show
DisabledB
utton="Boolean(mr.removeWIPPath)" />
<status-icon status="failed" :show
-disabled-b
utton="Boolean(mr.removeWIPPath)" />
<div class="media-body space-children">
<div class="media-body space-children">
<span class="bold">
<span class="bold">
This is a Work in Progress
This is a Work in Progress
...
...
changelogs/unreleased/38417-use-explicit-boolean-vue-attribute.yml
0 → 100644
View file @
b94a26ad
---
title
:
Use explicit boolean
true
attribute for show-disabled-button in Vue files
merge_request
:
14672
author
:
type
:
fixed
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