Merge branch '293819-enable-sort-diffs-default' into 'master'

Enable sorting diffs by default

See merge request gitlab-org/gitlab!54210

app/models/merge_request_diff.rb

@@ -768,7 +768,7 @@ class MergeRequestDiff < ApplicationRecord
   end
 
   def sort_diffs?
-    Feature.enabled?(:sort_diffs, project, default_enabled: false)
+    Feature.enabled?(:sort_diffs, project, default_enabled: :yaml)
   end
 end
 

changelogs/unreleased/293819-enable-sort-diffs-default.yml

+---
+title: Enable sorting diffs by default
+merge_request: 54210
+author:
+type: other

config/feature_flags/development/sort_diffs.yml

 ---
 name: sort_diffs
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49118
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/293819
 milestone: '13.7'
 type: development
 group: group::code review
-default_enabled: false
+default_enabled: true

lib/gitlab/diff/file_collection/base.rb

@@ -117,7 +117,7 @@ module Gitlab
         end
 
         def sort_diffs(diffs)
-          return diffs unless Feature.enabled?(:sort_diffs, project, default_enabled: false)
+          return diffs unless Feature.enabled?(:sort_diffs, project, default_enabled: :yaml)
 
           Gitlab::Diff::FileCollectionSorter.new(diffs).sort
         end