Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 11 deletions

diff --git a/spec/support/shared_examples/models/wiki_shared_examples.rb b/spec/support/shared_examples/models/wiki_shared_examples.rb
index b1aa90449e1..1fa8ccf4b55 100644
--- a/spec/support/shared_examples/models/wiki_shared_examples.rb
+++ b/spec/support/shared_examples/models/wiki_shared_examples.rb
@@ -207,17 +207,7 @@ RSpec.shared_examples 'wiki model' do
       end
     end
 
-    context 'list pages with legacy wiki rpcs' do
-      before do
-        stub_feature_flags(wiki_list_page_with_normal_repository_rpcs: false)
-      end
-
-      it_behaves_like 'wiki model #list_pages'
-    end
-
-    context 'list pages with normal repository rpcs' do
-      it_behaves_like 'wiki model #list_pages'
-    end
+    it_behaves_like 'wiki model #list_pages'
   end
 
   describe '#sidebar_entries' do