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
d5745c66
Commit
d5745c66
authored
May 06, 2020
by
Frederic Caplette
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix first round of review
Add 2 updates after Payton's review of this MR.
parent
1d96b8fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
...ue_merge_request_widget/components/mr_widget_pipeline.vue
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
...merge_request_widget/components/states/ready_to_merge.vue
+1
-4
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
View file @
d5745c66
...
...
@@ -67,7 +67,7 @@ export default {
return
(
this
.
hasCi
&&
!
this
.
ciStatus
)
||
this
.
hasPipelineMustSucceedConflict
;
},
hasPipelineMustSucceedConflict
()
{
return
!
this
.
hasCi
&&
Boolean
(
this
.
pipelineMustSucceed
)
;
return
!
this
.
hasCi
&&
this
.
pipelineMustSucceed
;
},
status
()
{
return
this
.
pipeline
.
details
&&
this
.
pipeline
.
details
.
status
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
View file @
d5745c66
...
...
@@ -326,10 +326,7 @@ export default {
</li>
</ul>
</span>
<div
class=
"media-body-wrap"
:class=
"
{ 'space-children': !hasPipelineMustSucceedConflict }"
>
<div
class=
"media-body-wrap space-children"
>
<template
v-if=
"shouldShowMergeControls"
>
<label
v-if=
"mr.canRemoveSourceBranch"
>
<input
...
...
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