diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-11 12:08:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-11 12:08:16 +0000 |
| commit | 2761b4465bb13e170f0b8b2941d83f356a47eee6 (patch) | |
| tree | 9a34e185671e7a9afe8720c8eafc6a3319a63c97 /spec/models/merge_request_spec.rb | |
| parent | 43e40e8daaceafb9b78fde9ac5ce97584a210a90 (diff) | |
| download | gitlab-ce-2761b4465bb13e170f0b8b2941d83f356a47eee6.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/merge_request_spec.rb')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 7e9f933fa22..922f4ac8804 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -3252,14 +3252,6 @@ RSpec.describe MergeRequest, factory_default: :keep do describe '#mergeable_state?' do it_behaves_like 'for mergeable_state' - - context 'when merge state caching is off' do - before do - stub_feature_flags(mergeability_caching: false) - end - - it_behaves_like 'for mergeable_state' - end end describe "#public_merge_status" do |