kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
CE backport of "Fix a broken spec for EE"

See merge request gitlab-org/gitlab-ce!28357
This commit is contained in:
Rémy Coutable 2019-05-16 11:42:15 +00:00
commit 2d0f349baf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/services/merge_requests/rebase_service_spec.rb
View file

@ -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'