Commit 58433e8d authored by Etienne Baqué's avatar Etienne Baqué

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

Enable sorting diffs by default

See merge request gitlab-org/gitlab!54210
parents 09b26d68 cb17692a
...@@ -768,7 +768,7 @@ class MergeRequestDiff < ApplicationRecord ...@@ -768,7 +768,7 @@ class MergeRequestDiff < ApplicationRecord
end end
def sort_diffs? def sort_diffs?
Feature.enabled?(:sort_diffs, project, default_enabled: false) Feature.enabled?(:sort_diffs, project, default_enabled: :yaml)
end end
end end
......
---
title: Enable sorting diffs by default
merge_request: 54210
author:
type: other
--- ---
name: sort_diffs name: sort_diffs
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49118 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' milestone: '13.7'
type: development type: development
group: group::code review group: group::code review
default_enabled: false default_enabled: true
...@@ -117,7 +117,7 @@ module Gitlab ...@@ -117,7 +117,7 @@ module Gitlab
end end
def sort_diffs(diffs) 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 Gitlab::Diff::FileCollectionSorter.new(diffs).sort
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment