Merge branch 'ce-11621-fix-broken-master' into 'master'

CE backport of "Fix a broken spec for EE"

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

spec/services/merge_requests/rebase_service_spec.rb

@@ -58,7 +58,7 @@ describe MergeRequests::RebaseService do
 
     context 'with deprecated step rebase feature' do
       before do
-        allow(Feature).to receive(:disabled?).with(:two_step_rebase, anything).and_return(true)
+        stub_feature_flags(two_step_rebase: false)
       end
 
       it_behaves_like 'sequence of failure and success'