Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 0 insertions, 14 deletions

diff --git a/spec/requests/projects/ci/promeheus_metrics/histograms_controller_spec.rb b/spec/requests/projects/ci/promeheus_metrics/histograms_controller_spec.rb
index 5d2f3e98bb4..7d5eb1c9685 100644
--- a/spec/requests/projects/ci/promeheus_metrics/histograms_controller_spec.rb
+++ b/spec/requests/projects/ci/promeheus_metrics/histograms_controller_spec.rb
@@ -24,20 +24,6 @@ RSpec.describe 'Projects::Ci::PrometheusMetrics::HistogramsController' do
         expect(response).to have_gitlab_http_status(:not_found)
       end
     end
-
-    context 'with the feature flag disabled' do
-      before do
-        stub_feature_flags(ci_accept_frontend_prometheus_metrics: false)
-      end
-
-      it 'returns 202 Accepted' do
-        post histograms_route(histograms: [
-          { name: :pipeline_graph_link_calculation_duration_seconds, value: 1 }
-        ])
-
-        expect(response).to have_gitlab_http_status(:accepted)
-      end
-    end
   end
 
   def histograms_route(params = {})