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

diff --git a/.rubocop.yml b/.rubocop.yml
index 9b7a28d87e0ad61061f9411371c9f1c3df848902..1931eb55ff73af4121df66e05b96f90b383f0c4f 100644 (file)
--- 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 5833a6e359fdc5745aa710e87ef3007ed95d9e52..f49440e81159d59165f8366b8a8d03a37ef4056f 100644 (file)
--- 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 9568ea5f8cb2849f96c2510733a62e6b2d028ddc..69a97f37027466cf28c4974816d9b90380067161 100644 (file)
--- 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 6a579fd20c0e8ad4b137bfa22b28196732f83c4d..fb345ac72e4490a3e1d22977bea463b8ca93b664 100644 (file)
--- 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