diff --git a/.rubocop.yml b/.rubocop.yml
index d46296cf883..4470fd45c01 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,2 +1,7 @@
+inherit_from: .rubocop_todo.yml
+
 inherit_gem:
   rubocop-discourse: default.yml
+
+Discourse/NoResetColumnInformationInMigrations:
+  Enabled: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 00000000000..26c278c13be
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,18 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-06-17 14:48:01 +0800 using RuboCop version 0.85.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 60
+# Configuration parameters: Include.
+# Include: **/db/migrate/*, **/db/post_migrate/*
+Discourse/NoAddReferenceOrAliasesActiveRecordMigration:
+  Enabled: false
+
+# Offense count: 1
+Discourse/NoURIEscapeEncode:
+  Exclude:
+    - 'lib/file_store/s3_store.rb'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3f49375657a..c1ad5fb0ddf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -249,7 +249,7 @@ GEM
       sanitize
     openssl-signature_algorithm (0.4.0)
     optimist (3.0.1)
-    parallel (1.19.1)
+    parallel (1.19.2)
     parallel_tests (3.0.0)
       parallel
     parser (2.7.1.3)
@@ -359,7 +359,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.0.3)
       parser (>= 2.7.0.1)
-    rubocop-discourse (2.1.2)
+    rubocop-discourse (2.2.0)
       rubocop (>= 0.69.0)
       rubocop-rspec (>= 1.39.0)
     rubocop-rspec (1.40.0)