Commit 4a37d72f authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'phikai-merge-dependency-text' into 'master'

Remove closed from dependency block

See merge request gitlab-org/gitlab!83029
parents 70f0c25a 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 {
......
......@@ -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
......
......@@ -23211,7 +23211,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."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment