diff --git a/.ruby-style.yml b/.ruby-style.yml
index ae853fb2aa..4c06a13f1b 100644
--- a/.ruby-style.yml
+++ b/.ruby-style.yml
@@ -1133,6 +1133,9 @@ Rails/ContentTag:
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
+Rails/DangerousColumnNames:
+  Enabled: false
+
 Rails/Date:
   Enabled: false
 
@@ -1298,6 +1301,9 @@ Rails/RakeEnvironment:
 Rails/ReadWriteAttribute:
   Enabled: false
 
+Rails/RedundantActiveRecordAllMethod:
+  Enabled: false
+
 Rails/RedundantAllowNil:
   Enabled: false
 
@@ -1367,6 +1373,9 @@ Rails/SchemaComment:
 Rails/ScopeArgs:
   Enabled: false
 
+Rails/SelectMap:
+  Enabled: false
+
 Rails/ShortI18n:
   Enabled: false
 
@@ -1415,6 +1424,9 @@ Rails/UnknownEnv:
 Rails/UnusedIgnoredColumns:
   Enabled: false
 
+Rails/UnusedRenderContent:
+  Enabled: false
+
 Rails/Validation:
   Enabled: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7f4372f5fa..882e3becb4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -475,7 +475,7 @@ GEM
     rubocop-performance (1.19.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.20.2)
+    rubocop-rails (2.21.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)