Merge pull request #123 from github/remove-upstream-dupes

Replace custom `RailsApplicationRecord` and `RailsRenderInline` cops with their upstream equivalent
github · Oct 26, 2022 · 2a2a9d0 · 2a2a9d0
2 parents 1567efb + fb20774
commit 2a2a9d0
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 197 deletions.
diff --git a/config/rails.yml b/config/rails.yml
@@ -2,9 +2,6 @@ require:
   - rubocop-github-rails
   - rubocop-rails
 
-GitHub/RailsApplicationRecord:
-  Enabled: true
-
 GitHub/RailsControllerRenderActionSymbol:
   Enabled: true
 
@@ -17,9 +14,6 @@ GitHub/RailsControllerRenderPathsExist:
 GitHub/RailsControllerRenderShorthand:
   Enabled: true
 
-GitHub/RailsRenderInline:
-  Enabled: true
-
 GitHub/RailsRenderObjectCollection:
   Enabled: false
 
@@ -94,7 +88,7 @@ Rails/ApplicationMailer:
   Enabled: false
 
 Rails/ApplicationRecord:
-  Enabled: false
+  Enabled: true
 
 Rails/ArelStar:
   Enabled: false
@@ -307,7 +301,7 @@ Rails/RelativeDateConstant:
   Enabled: false
 
 Rails/RenderInline:
-  Enabled: false
+  Enabled: true
 
 Rails/RenderPlainText:
   Enabled: false

diff --git a/config/rails_cops.yml b/config/rails_cops.yml
@@ -1,6 +1,3 @@
-GitHub/RailsApplicationRecord:
-  Enabled: pending
-
 GitHub/RailsControllerRenderActionSymbol:
   Enabled: pending
   Include:

diff --git a/guides/rails-render-inline.md b/guides/rails-render-inline.md
diff --git a/lib/rubocop/cop/github/rails_application_record.rb b/lib/rubocop/cop/github/rails_application_record.rb
diff --git a/lib/rubocop/cop/github/rails_render_inline.rb b/lib/rubocop/cop/github/rails_render_inline.rb
diff --git a/test/test_rails_application_record.rb b/test/test_rails_application_record.rb
diff --git a/test/test_rails_render_inline.rb b/test/test_rails_render_inline.rb