Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 5 deletions

diff --git a/lib/banzai/filter/inline_grafana_metrics_filter.rb b/lib/banzai/filter/inline_grafana_metrics_filter.rb
index 34d93a59f48..321580b532f 100644
--- a/lib/banzai/filter/inline_grafana_metrics_filter.rb
+++ b/lib/banzai/filter/inline_grafana_metrics_filter.rb
@@ -18,8 +18,6 @@ module Banzai
       end
 
       def embed_params(node)
-        return unless Feature.enabled?(:gfm_grafana_integration)
-
         query_params = Gitlab::Metrics::Dashboard::Url.parse_query(node['href'])
         return unless [:panelId, :from, :to].all? do |param|
           query_params.include?(param)
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index f1e31a615a4..2616a19fdaa 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -42,9 +42,6 @@ module Gitlab
       # Initialize gon.features with any flags that should be
       # made globally available to the frontend
       push_frontend_feature_flag(:suppress_ajax_navigation_errors, default_enabled: true)
-
-      # Flag controls a GFM feature used across many routes.
-      push_frontend_feature_flag(:gfm_grafana_integration)
     end
 
     # Exposes the state of a feature flag to the frontend code.