From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 May 2021 10:53:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3195'
X-Git-Tag: live~2157
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c3cc8ea541542d3c983befb326c38b8edf56166c?hp=cb86e74f69c6b1fe62b06d037396976fadfa3ad8

Merge remote-tracking branch 'upstream/pull/3195'
---

diff --git a/.rubocop.yml b/.rubocop.yml
index 9b7a28d87..1931eb55f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,6 +4,7 @@ require:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
+  - rubocop-rake
 
 AllCops:
   TargetRubyVersion: 2.5
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5833a6e35..f49440e81 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -12,6 +12,7 @@ require:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
+  - rubocop-rake
 
 # Offense count: 544
 # Cop supports --auto-correct.
@@ -168,6 +169,20 @@ Rails/OutputSafety:
 Rails/TimeZone:
   Enabled: false
 
+# Offense count: 8
+Rake/Desc:
+  Exclude:
+    - 'lib/tasks/auto_annotate_models.rake'
+    - 'lib/tasks/eslint.rake'
+    - 'lib/tasks/subscribe_diary_authors.rake'
+    - 'lib/tasks/subscribe_old_changesets.rake'
+    - 'lib/tasks/testing.rake'
+
+# Offense count: 3
+Rake/MethodDefinitionInTask:
+  Exclude:
+    - 'lib/tasks/eslint.rake'
+
 # Offense count: 558
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
diff --git a/Gemfile b/Gemfile
index 9568ea5f8..69a97f370 100644
--- a/Gemfile
+++ b/Gemfile
@@ -142,6 +142,7 @@ group :test do
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"
+  gem "rubocop-rake"
   gem "selenium-webdriver"
   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 6a579fd20..fb345ac72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -408,6 +408,8 @@ GEM
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.5.1)
+      rubocop
     ruby-openid (2.9.2)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.4)
@@ -540,6 +542,7 @@ DEPENDENCIES
   rubocop-minitest
   rubocop-performance
   rubocop-rails
+  rubocop-rake
   sanitize
   sassc-rails
   secure_headers