From 6a124219f0e5efaf6e41239d05abe1723c476f90 Mon Sep 17 00:00:00 2001
From: Peter Leitzen <pleitzen@gitlab.com>
Date: Tue, 5 Jan 2021 13:08:02 +0100
Subject: [PATCH] Fix Rubocop TODO Lint/NonDeterministicRequireOrder
---
.rubocop_todo.yml | 6 ------
rubocop/rubocop.rb | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6bf120b8fb875..80b22a060929e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -166,12 +166,6 @@ Lint/MixedRegexpCaptureTypes:
- 'lib/gitlab/slash_commands/issue_new.rb'
- 'lib/gitlab/slash_commands/run.rb'
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/NonDeterministicRequireOrder:
- Exclude:
- - 'rubocop/rubocop.rb'
-
# Offense count: 135
# Cop supports --auto-correct.
Lint/RedundantCopDisableDirective:
diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb
index 08e09747ae262..c8a573410d892 100644
--- a/rubocop/rubocop.rb
+++ b/rubocop/rubocop.rb
@@ -1,4 +1,4 @@
# frozen_string_literal: true
# Auto-require all cops under `rubocop/cop/**/*.rb`
-Dir[File.join(__dir__, 'cop', '**', '*.rb')].each(&method(:require))
+Dir[File.join(__dir__, 'cop', '**', '*.rb')].sort.each(&method(:require))
--
GitLab