Merge branch 'master' into try-to-fix-ipstats-test

.codeclimate.yml

@@ -120,7 +120,7 @@ plugins:
     # Specify RuboCop version so that we're not stuck with Code Climate's
     # default, which can be different than what's in Gemfile.lock. See
     # docs.codeclimate.com/docs/rubocop#section-using-rubocop-s-newer-versions
-    channel: rubocop-0-89
+    channel: rubocop-1-23-0
 
 # scss style checker
   scss-lint:

.rubocop.yml

@@ -5,37 +5,18 @@ require:
   - rubocop-rails
 
 # ------------------------------------------------------------------------------
+# Updating RuboCop
 #
-# UPDATING RUBOCOP in MushroomObserver
-# Please use the following procedure or equivalent in order to:
-# - Avoid discrepancies between RuboCop locally vs in continuous integration;
-# - Prevent increases in the number of offenses.
-#
-# *** Update the Codeclimate channel
+# *** Update The Codeclimate Channel When Updating Rubocop
+# See docs.codeclimate.com/docs/rubocop#section-using-rubocop-s-newer-versions
+# Use the highest available channel that's compatible with the RuboCop version.
 # .codeclimate.yml specifies the RuboCop version ('channel') used
 # by Code Climate, which can be different than the version in Gemfile.lock
-# See docs.codeclimate.com/docs/rubocop#section-using-rubocop-s-newer-versions
-# Therefore .codeclimate.yml should be updated whenever updating RuboCop
-#
-# *** Install the higher version of rubocop
-# - Update the Gemfile
-# - bundle update rubocop
-#
-# *** Update the RuboCop configuration (this file)
-# - Run "rubocop --auto-gen-config" BUT DON'T COMMIT .rubocop_todo.yml
-# - Add any new cops to .rubocop.yml (this file) if the output so indicates.
-#
-# *** Fix any new offenses caused by the update
-# - Iteratively do the following steps until all new offenses are fixed:
-#   - Again run "rubocop --auto-gen-config" BUT DON'T COMMIT .rubocop_todo.yml
-#   - Compare the newly generated and existing versions of .rubocop_todo.yml
-#   - Fix any new offenses.
-# (The initial new offenses will have been caused by new or updated cops.
-#  Fixing those offenses may cause new offenses. And so forth.)
 #
-# *** Prune the todo list
-# Compare the new and existing versions of .rubocop_todo.yml (the todo list)
-# Accept any changes that reduce the todo list.
+# *** Re-generate the RuboCop auto-configuration todo list
+# at least run rubocop --regenerate-todo and commit changes
+# optionally follow other suggestions at
+# https://docs.rubocop.org/rubocop/configuration.html#automatically-generated-configuration
 #
 # ------------------------------------------------------------------------------
 
@@ -45,7 +26,7 @@ require:
 
 AllCops:
   # See https://docs.rubocop.org/rubocop/versioning.html#pending-cops
-  NewCops: enable
+  NewCops: disable
 
   ########################### Excluded files ###################################
   # Completely ignore the following