diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-26 21:09:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-26 21:09:19 +0300 |
| commit | 67049ac7aa4accb5a964975291ce5890e65c3110 (patch) | |
| tree | df8e1d34e5facf7892afed250de4bb2b9dbcd689 /rubocop | |
| parent | 5169b4a63b1e592e159b5451f81bc3c11602275f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'rubocop')
| -rw-r--r-- | rubocop/cop/gitlab/change_timezone.rb (renamed from rubocop/cop/gitlab/change_timzone.rb) | 0 | ||||
| -rw-r--r-- | rubocop/cop/gitlab/keys_first_and_values_first.rb (renamed from rubocop/cop/gitlab/keys-first-and-values-first.rb) | 0 | ||||
| -rw-r--r-- | rubocop/rubocop.rb | 3 |
3 files changed, 3 insertions, 0 deletions
diff --git a/rubocop/cop/gitlab/change_timzone.rb b/rubocop/cop/gitlab/change_timezone.rb index c30a057d51c..c30a057d51c 100644 --- a/rubocop/cop/gitlab/change_timzone.rb +++ b/rubocop/cop/gitlab/change_timezone.rb diff --git a/rubocop/cop/gitlab/keys-first-and-values-first.rb b/rubocop/cop/gitlab/keys_first_and_values_first.rb index e9bf266cdd7..e9bf266cdd7 100644 --- a/rubocop/cop/gitlab/keys-first-and-values-first.rb +++ b/rubocop/cop/gitlab/keys_first_and_values_first.rb diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb index c8a573410d8..5a5e76a87e2 100644 --- a/rubocop/rubocop.rb +++ b/rubocop/rubocop.rb @@ -1,4 +1,7 @@ +# rubocop:disable Naming/FileName # frozen_string_literal: true # Auto-require all cops under `rubocop/cop/**/*.rb` Dir[File.join(__dir__, 'cop', '**', '*.rb')].sort.each(&method(:require)) + +# rubocop:enable Naming/FileName |