Guard with feature flag

1 files changed, 10 insertions, 5 deletions

diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb
index 91de910796b..f712b8863cd 100644
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
@@ -66,13 +66,18 @@ module MergeRequests
 
       return if merge_requests.empty?
 
-      analyzer = Gitlab::BranchPushMergeCommitAnalyzer.new(
-        @commits.reverse,
-        relevant_commit_ids: merge_requests.map(&:diff_head_sha)
-      )
+      commit_analyze_enabled = Feature.enabled?(:branch_push_merge_commit_analyze, @project, default_enabled: true)
+      if commit_analyze_enabled
+        analyzer = Gitlab::BranchPushMergeCommitAnalyzer.new(
+          @commits.reverse,
+          relevant_commit_ids: merge_requests.map(&:diff_head_sha)
+        )
+      end
 
       merge_requests.each do |merge_request|
-        merge_request.merge_commit_sha = analyzer.get_merge_commit(merge_request.diff_head_sha)
+        if commit_analyze_enabled
+          merge_request.merge_commit_sha = analyzer.get_merge_commit(merge_request.diff_head_sha)
+        end
 
         MergeRequests::PostMergeService
           .new(merge_request.target_project, @current_user)