diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-05-16 11:42:15 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-05-16 11:42:15 +0000 |
| commit | 2d0f349baf83bee47c062896ac71a678e3b5f77b (patch) | |
| tree | 8a7d4e2964a668c1489ee8ddb40c3340d5a7bf7b | |
| parent | 9afe8d3bcd1f3f39c8543f675e2522e73dd78b59 (diff) | |
| parent | 22f8da985a8919eb350bbcacb89f176cecf986bc (diff) | |
| download | gitlab-ce-2d0f349baf83bee47c062896ac71a678e3b5f77b.tar.gz | |
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
| -rw-r--r-- | spec/services/merge_requests/rebase_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/rebase_service_spec.rb b/spec/services/merge_requests/rebase_service_spec.rb index 0c4433453ac..7e2f03d1097 100644 --- a/spec/services/merge_requests/rebase_service_spec.rb +++ b/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' |