.rubocop.yml in activeadmin-1.3.1 vs .rubocop.yml in activeadmin-1.4.0

@@ -1,31 +1,43 @@
 ---
 
+inherit_mode:
+  merge:
+    - Include
+
 AllCops:
   DisabledByDefault: true
   TargetRubyVersion: 2.3
 
   Exclude:
     - spec/rails/**/*
     - gemfiles/vendor/bundle/**/*
+    - vendor/bundle/**/*
 
   Include:
-    - "**/*.rake"
-    - "**/Gemfile"
-    - "gemfiles/*.gemfile"
-    - "**/Rakefile"
+    - gemfiles/*.gemfile
+    - .simplecov
 
   DisplayCopNames: true
 
   StyleGuideCopsOnly: false
 
-Lint/EndAlignment:
+Layout/EndAlignment:
   Enabled: true
 
+Lint/ParenthesesAsGroupedExpression:
+  Enabled: true
+
+Layout/AccessModifierIndentation:
+  Enabled: true
+
 Layout/CaseIndentation:
   Enabled: true
 
+Layout/CommentIndentation:
+  Enabled: true
+
 Layout/ElseAlignment:
   Enabled: true
 
 Layout/EmptyLines:
   Enabled: true
@@ -35,31 +47,37 @@
 
 Layout/ExtraSpacing:
   Enabled: true
 
 Style/Encoding:
-  EnforcedStyle: never
   Enabled: true
 
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: never
+
 Style/HashSyntax:
   Enabled: true
 
 Layout/IndentationConsistency:
   Enabled: true
 
 Layout/IndentationWidth:
   Enabled: true
 
-Style/PredicateName:
+Naming/PredicateName:
   Enabled: true
 
   NamePrefixBlacklist:
     - is_
     - have_
 
   NameWhitelist:
     - has_many
     - has_many_actions
+
+Style/TrailingCommaInArguments:
+  Enabled: true
 
 Layout/TrailingBlankLines:
   Enabled: true
 
 Layout/TrailingWhitespace: