Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 15 deletions

diff --git a/spec/serializers/environment_serializer_spec.rb b/spec/serializers/environment_serializer_spec.rb
index 80b6f00d8c9..658062c9461 100644
--- a/spec/serializers/environment_serializer_spec.rb
+++ b/spec/serializers/environment_serializer_spec.rb
@@ -204,21 +204,6 @@ RSpec.describe EnvironmentSerializer do
 
       json
     end
-
-    # Including for test coverage pipeline failure, remove along with feature flag.
-    context 'when custom preload feature is disabled' do
-      before do
-        Feature.disable(:custom_preloader_for_deployments)
-      end
-
-      it 'avoids N+1 database queries' do
-        control_count = ActiveRecord::QueryRecorder.new { json }.count
-
-        create_environment_with_associations(project)
-
-        expect { json }.not_to exceed_query_limit(control_count)
-      end
-    end
   end
 
   def create_environment_with_associations(project)