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
513f1032
Commit
513f1032
authored
Mar 16, 2022
by
Kai Armstrong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove closed from dependency block
parent
74b0b68e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
...scripts/vue_merge_request_widget/mixins/ready_to_merge.js
+1
-1
ee/spec/features/merge_request/merge_request_widget_blocking_mrs_spec.rb
...s/merge_request/merge_request_widget_blocking_mrs_spec.rb
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
View file @
513f1032
...
...
@@ -16,7 +16,7 @@ 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
.
'
,
'
Merge blocked: all merge request dependencies must be merged.
'
,
);
export
default
{
...
...
ee/spec/features/merge_request/merge_request_widget_blocking_mrs_spec.rb
View file @
513f1032
...
...
@@ -21,7 +21,7 @@ RSpec.describe "User views merge request with blocking merge requests", :js do
it
'disables merge button when blocking merge request is open'
do
page
.
within
(
'.mr-widget-section'
)
do
expect
(
page
).
to
have_content
(
'Merge blocked: all merge request dependencies must be merged
or closed
.'
)
expect
(
page
).
to
have_content
(
'Merge blocked: all merge request dependencies must be merged.'
)
end
end
...
...
@@ -30,7 +30,7 @@ RSpec.describe "User views merge request with blocking merge requests", :js do
it
'enables merge button when blocking merge request is merged'
do
page
.
within
(
'.mr-widget-section'
)
do
expect
(
page
).
not_to
have_content
(
'Merge blocked: all merge request dependencies must be merged
or closed
.'
)
expect
(
page
).
not_to
have_content
(
'Merge blocked: all merge request dependencies must be merged.'
)
end
end
end
...
...
locale/gitlab.pot
View file @
513f1032
...
...
@@ -23135,7 +23135,7 @@ msgstr ""
msgid "Merge automatically (%{strategy})"
msgstr ""
msgid "Merge blocked: all merge request dependencies must be merged
or closed
."
msgid "Merge blocked: all merge request dependencies must be merged."
msgstr ""
msgid "Merge blocked: merge request must be marked as ready. It's still marked as draft."
...
...
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