diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-12 00:10:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-12 00:10:27 +0000 |
| commit | a160c4b1a72105a751cdc2f9f973dbe39a1c0dfd (patch) | |
| tree | 8383dcf5249407b3301289415ed9c3daccd43057 /lib/gitlab/diff | |
| parent | 0ae8428c8e77d5d7e098827be688b1f146321af1 (diff) | |
| download | gitlab-ce-a160c4b1a72105a751cdc2f9f973dbe39a1c0dfd.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/file_collection/base.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/diff/file_collection/base.rb b/lib/gitlab/diff/file_collection/base.rb index 627abfbfe7e..9ed03c05f0b 100644 --- a/lib/gitlab/diff/file_collection/base.rb +++ b/lib/gitlab/diff/file_collection/base.rb @@ -117,8 +117,6 @@ module Gitlab end def sort_diffs(diffs) - return diffs unless Feature.enabled?(:sort_diffs, project, default_enabled: :yaml) - Gitlab::Diff::FileCollectionSorter.new(diffs).sort end end |