Commit 2d0f349b authored by Rémy Coutable's avatar Rémy Coutable

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
parents 9afe8d3b 22f8da98
...@@ -58,7 +58,7 @@ describe MergeRequests::RebaseService do ...@@ -58,7 +58,7 @@ describe MergeRequests::RebaseService do
context 'with deprecated step rebase feature' do context 'with deprecated step rebase feature' do
before do before do
allow(Feature).to receive(:disabled?).with(:two_step_rebase, anything).and_return(true) stub_feature_flags(two_step_rebase: false)
end end
it_behaves_like 'sequence of failure and success' it_behaves_like 'sequence of failure and success'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment