Merge branch 'rs-transient-failure' into 'master'

Resolve a transient failure in MWPS feature spec

Closes gitlab-ee#6770

See merge request gitlab-org/gitlab-ce!23838

spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb

@@ -88,6 +88,8 @@ describe 'Merge request > User merges when pipeline succeeds', :js do
     describe 'enabling Merge when pipeline succeeds via dropdown' do
       it 'activates the Merge when pipeline succeeds feature' do
+        wait_for_requests
+
         find('.js-merge-moment').click
         click_link 'Merge when pipeline succeeds'