Commit aafc27c0 authored by Nathan Friend's avatar Nathan Friend Committed by Lin Jen-Shin

Remove "target branch advanced" warning from FE code (EE)

Removes the "target branch advanced" warning from the frontend
as it is no longer needed due to the new merge trains feature.
parent 88196399
......@@ -322,18 +322,6 @@ export default {
}}
</mr-widget-alert-message>
<mr-widget-alert-message
v-if="showTargetBranchAdvancedError"
type="danger"
:help-path="mr.mergeRequestPipelinesHelpPath"
>
{{
s__(
'mrWidget|The target branch has advanced, which invalidates the merge request pipeline. Please update the source branch and retry merging',
)
}}
</mr-widget-alert-message>
<mr-widget-alert-message v-if="mr.mergeError" type="danger">
{{ mergeError }}
</mr-widget-alert-message>
......
......@@ -45,21 +45,6 @@ describe 'Merge request > User sees merge widget', :js do
expect(page).not_to have_css('.danger_message')
end
context 'when target branch is advanced' do
let(:options) { { target_sha: 'old-commit' } }
it 'shows a warning that fork project cannot create merge request pipelines' do
visit project_merge_request_path(project, merge_request)
within('.danger_message') do
expect(page)
.to have_content('The target branch has advanced, which invalidates ' \
'the merge request pipeline. Please update the source ' \
'branch and retry merging')
end
end
end
end
context 'when merge request is submitted from a forked project' do
......
......@@ -16332,9 +16332,6 @@ msgstr ""
msgid "mrWidget|The source branch will not be deleted"
msgstr ""
msgid "mrWidget|The target branch has advanced, which invalidates the merge request pipeline. Please update the source branch and retry merging"
msgstr ""
msgid "mrWidget|There are merge conflicts"
msgstr ""
......
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