Merge branch 'issue_21824' into 'master'
Fix issuable templates dropdown for forked projects fixes #21824 See merge request !6329
This commit is contained in:
commit
cffa529e95
|
@ -7,6 +7,7 @@ v 8.12.0 (unreleased)
|
||||||
- Cleanup misalignments in Issue list view !6206
|
- Cleanup misalignments in Issue list view !6206
|
||||||
- Prune events older than 12 months. (ritave)
|
- Prune events older than 12 months. (ritave)
|
||||||
- Prepend blank line to `Closes` message on merge request linked to issue (lukehowell)
|
- Prepend blank line to `Closes` message on merge request linked to issue (lukehowell)
|
||||||
|
- Fix issues/merge-request templates dropdown for forked projects
|
||||||
- Filter tags by name !6121
|
- Filter tags by name !6121
|
||||||
- Update gitlab shell secret file also when it is empty. !3774 (glensc)
|
- Update gitlab shell secret file also when it is empty. !3774 (glensc)
|
||||||
- Give project selection dropdowns responsive width, make non-wrapping.
|
- Give project selection dropdowns responsive width, make non-wrapping.
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
= dropdown_tag(title, options: { toggle_class: 'js-issuable-selector',
|
= dropdown_tag(title, options: { toggle_class: 'js-issuable-selector',
|
||||||
title: title, filter: true, placeholder: 'Filter', footer_content: true,
|
title: title, filter: true, placeholder: 'Filter', footer_content: true,
|
||||||
data: { data: issuable_template_names, field_name: 'issuable_template', selected: selected_template(issuable), project_path: @project.path, namespace_path: @project.namespace.path } } ) do
|
data: { data: issuable_template_names, field_name: 'issuable_template', selected: selected_template(issuable), project_path: ref_project.path, namespace_path: ref_project.namespace.path } } ) do
|
||||||
%ul.dropdown-footer-list
|
%ul.dropdown-footer-list
|
||||||
%li
|
%li
|
||||||
%a.reset-template
|
%a.reset-template
|
||||||
|
|
|
@ -64,7 +64,7 @@ feature 'issuable templates', feature: true, js: true do
|
||||||
let(:template_content) { 'this is a test "feature-proposal" template' }
|
let(:template_content) { 'this is a test "feature-proposal" template' }
|
||||||
let(:fork_user) { create(:user) }
|
let(:fork_user) { create(:user) }
|
||||||
let(:fork_project) { create(:project, :public) }
|
let(:fork_project) { create(:project, :public) }
|
||||||
let(:merge_request) { create(:merge_request, :with_diffs, source_project: fork_project) }
|
let(:merge_request) { create(:merge_request, :with_diffs, source_project: fork_project, target_project: project) }
|
||||||
|
|
||||||
background do
|
background do
|
||||||
logout
|
logout
|
||||||
|
@ -72,16 +72,20 @@ feature 'issuable templates', feature: true, js: true do
|
||||||
fork_project.team << [fork_user, :master]
|
fork_project.team << [fork_user, :master]
|
||||||
create(:forked_project_link, forked_to_project: fork_project, forked_from_project: project)
|
create(:forked_project_link, forked_to_project: fork_project, forked_from_project: project)
|
||||||
login_as fork_user
|
login_as fork_user
|
||||||
fork_project.repository.commit_file(fork_user, '.gitlab/merge_request_templates/feature-proposal.md', template_content, 'added merge request template', 'master', false)
|
project.repository.commit_file(fork_user, '.gitlab/merge_request_templates/feature-proposal.md', template_content, 'added merge request template', 'master', false)
|
||||||
visit edit_namespace_project_merge_request_path fork_project.namespace, fork_project, merge_request
|
visit edit_namespace_project_merge_request_path project.namespace, project, merge_request
|
||||||
fill_in :'merge_request[title]', with: 'test merge request title'
|
fill_in :'merge_request[title]', with: 'test merge request title'
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario 'user selects "feature-proposal" template' do
|
context 'feature proposal template' do
|
||||||
select_template 'feature-proposal'
|
context 'template exists in target project' do
|
||||||
wait_for_ajax
|
scenario 'user selects template' do
|
||||||
preview_template
|
select_template 'feature-proposal'
|
||||||
save_changes
|
wait_for_ajax
|
||||||
|
preview_template
|
||||||
|
save_changes
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue