Skip to content
Snippets Groups Projects
Unverified Commit 352ec5eb authored by Paul Slaughter's avatar Paul Slaughter
Browse files

CE port of "Move merge request approval settings"

This is for the upcoming feature for MR approval rules (https://gitlab.com/gitlab-org/gitlab-ee/issues/1979)
parent 50e6cc11
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -95,6 +95,8 @@
= render 'projects/merge_request_settings', form: f
= f.submit 'Save changes', class: "btn btn-success qa-save-merge-request-changes"
 
= render_if_exists 'projects/merge_request_approvals_settings', expanded: expanded
= render_if_exists 'projects/service_desk_settings'
 
%section.settings.no-animate{ class: ('expanded' if expanded) }
Loading
Loading
Loading
Loading
@@ -10,19 +10,19 @@ describe 'Projects > Settings > User manages merge request settings' do
end
 
it 'shows "Merge commit" strategy' do
page.within '.merge-requests-feature' do
page.within '#js-merge-request-settings' do
expect(page).to have_content 'Merge commit'
end
end
 
it 'shows "Merge commit with semi-linear history " strategy' do
page.within '.merge-requests-feature' do
page.within '#js-merge-request-settings' do
expect(page).to have_content 'Merge commit with semi-linear history'
end
end
 
it 'shows "Fast-forward merge" strategy' do
page.within '.merge-requests-feature' do
page.within '#js-merge-request-settings' do
expect(page).to have_content 'Fast-forward merge'
end
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment