diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-08-10 16:14:12 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-08-10 16:14:12 +0000 |
| commit | 9de7eb573e0646740f0ff4d8a7191d2d12e26b42 (patch) | |
| tree | 18ad6dfbdab8d3d6aeb11ef6d2f92dea3ebccdc2 | |
| parent | e733c446f70098a5aa76f3699dca03d1a51f03cc (diff) | |
| parent | e874fdbacc8f177603c5300c2abf3c16d76d38d1 (diff) | |
| download | gitlab-ce-9de7eb573e0646740f0ff4d8a7191d2d12e26b42.tar.gz | |
Merge branch '27884-disable-the-safenavigation-cop' into 'master'
Resolve "Consider enforcing the use of the new Ruby safe navigation operator (aka `&.`)"
Closes #27884
See merge request gitlab-org/gitlab-ce!21140
| -rw-r--r-- | .rubocop.yml | 4 | ||||
| -rw-r--r-- | .rubocop_todo.yml | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index c8b1ce327e2..a586190319b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -31,6 +31,10 @@ Style/MutableConstant: - 'ee/db/post_migrate/**/*' - 'ee/db/geo/migrate/**/*' +# TODO: Move this to gitlab-styles +Style/SafeNavigation: + Enabled: false + Naming/FileName: ExpectMatchingDefinition: true Exclude: diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 8a1ca6747a8..54e3b8217d8 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -706,12 +706,6 @@ Style/RescueModifier: Style/RescueStandardError: Enabled: false -# Offense count: 92 -# Cop supports --auto-correct. -# Configuration parameters: ConvertCodeThatCanStartToReturnNil. -Style/SafeNavigation: - Enabled: false - # Offense count: 8 # Cop supports --auto-correct. Style/SelfAssignment: |