From 37723ac46e66416d1a7cb3e661d51f5525ba3d8b Mon Sep 17 00:00:00 2001
From: Adam Hegyi <ahegyi@gitlab.com>
Date: Mon, 11 Oct 2021 14:09:15 +0200
Subject: [PATCH] Default enable use_upsert_query_for_mr_metrics FF

This change enables the use_upsert_query_for_mr_metrics feature flag by
default.

Changelog: changed
---
 app/models/merge_request.rb                                     | 2 +-
 .../development/use_upsert_query_for_mr_metrics.yml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 7cb821eab0bd03dc..15862fb2bfa927c4 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1869,7 +1869,7 @@ def banzai_render_context(field)
 
   override :ensure_metrics
   def ensure_metrics
-    if Feature.enabled?(:use_upsert_query_for_mr_metrics)
+    if Feature.enabled?(:use_upsert_query_for_mr_metrics, default_enabled: :yaml)
       MergeRequest::Metrics.record!(self)
     else
       # Backward compatibility: some merge request metrics records will not have target_project_id filled in.
diff --git a/config/feature_flags/development/use_upsert_query_for_mr_metrics.yml b/config/feature_flags/development/use_upsert_query_for_mr_metrics.yml
index 14cc5d1a98cd2271..605bc54b78a293e8 100644
--- a/config/feature_flags/development/use_upsert_query_for_mr_metrics.yml
+++ b/config/feature_flags/development/use_upsert_query_for_mr_metrics.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339677
 milestone: '14.3'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true
-- 
GitLab