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
3a7a22c5
Commit
3a7a22c5
authored
Mar 10, 2022
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed incorrect merge disabled text showing
Closes
https://gitlab.com/gitlab-org/gitlab/-/issues/228922
parent
7204aec7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
7 deletions
+16
-7
app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
...scripts/vue_merge_request_widget/mixins/ready_to_merge.js
+1
-3
ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
...scripts/vue_merge_request_widget/mixins/ready_to_merge.js
+12
-4
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
View file @
3a7a22c5
import
{
__
}
from
'
~/locale
'
;
export
const
MERGE_DISABLED_TEXT
=
__
(
'
Merge blocked: all merge request dependencies must be merged or closed.
'
,
);
export
const
MERGE_DISABLED_TEXT
=
__
(
'
You can only merge once the items above are resolved.
'
);
export
const
MERGE_DISABLED_SKIPPED_PIPELINE_TEXT
=
__
(
"
Merge blocked: pipeline must succeed. It's waiting for a manual job to continue.
"
,
);
...
...
ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
View file @
3a7a22c5
...
...
@@ -15,6 +15,9 @@ export const MERGE_DISABLED_TEXT_UNAPPROVED = s__(
export
const
PIPELINE_MUST_SUCCEED_CONFLICT_TEXT
=
__
(
'
A CI/CD pipeline must run and be successful before merge.
'
,
);
export
const
MERGE_DISABLED_DEPENDENCIES_TEXT
=
__
(
'
Merge blocked: all merge request dependencies must be merged or closed.
'
,
);
export
default
{
computed
:
{
...
...
@@ -31,15 +34,18 @@ export default {
this
.
mr
.
preventMerge
,
);
},
hasBlockingMergeRequests
()
{
return
(
(
this
.
mr
.
blockingMergeRequests
?.
visible_merge_requests
?.
merged
?.
length
||
0
)
!==
(
this
.
mr
.
blockingMergeRequests
?.
total_count
||
0
)
);
},
shouldShowMergeControls
()
{
if
(
this
.
glFeatures
.
restructuredMrWidget
)
{
return
this
.
restructuredWidgetShowMergeButtons
;
}
if
(
(
this
.
mr
.
blockingMergeRequests
?.
visible_merge_requests
?.
merged
?.
length
||
0
)
!==
(
this
.
mr
.
blockingMergeRequests
?.
total_count
||
0
)
)
{
if
(
this
.
hasBlockingMergeRequests
)
{
return
false
;
}
...
...
@@ -48,6 +54,8 @@ export default {
mergeDisabledText
()
{
if
(
this
.
isApprovalNeeded
)
{
return
MERGE_DISABLED_TEXT_UNAPPROVED
;
}
else
if
(
this
.
hasBlockingMergeRequests
)
{
return
MERGE_DISABLED_DEPENDENCIES_TEXT
;
}
return
base
.
computed
.
mergeDisabledText
.
call
(
this
);
...
...
locale/gitlab.pot
View file @
3a7a22c5
...
...
@@ -42105,6 +42105,9 @@ msgstr ""
msgid "You can only edit files when you are on a branch"
msgstr ""
msgid "You can only merge once the items above are resolved."
msgstr ""
msgid "You can only transfer the project to namespaces you manage."
msgstr ""
...
...
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