Merge branch 'fix-rebase-in-progress-spinach-failure' into 'master'

Add a wait_for_ajax call to prevent Spinach failure

There may be a race condition after a user clicks "Rebase" and when
the DatabaseCleaner wipes all data.

See https://gitlab.com/gitlab-org/gitlab-ee/builds/5302296

See merge request !810

features/steps/project/ff_merge_requests.rb

@@ -7,6 +7,7 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
   include SharedMarkdown
   include SharedDiffNote
   include SharedUser
+  include WaitForAjax
 
   step 'project "Shop" have "Bug NS-05" open merge request with diffs inside' do
     create(:merge_request_with_diffs,
@@ -73,6 +74,7 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
 
   step 'I press rebase button' do
     click_button "Rebase"
+    wait_for_ajax
   end
 
   step "I should see rebase in progress message" do