Skip to content

Commit 2a2a9d0

Browse files
authored
Merge pull request #123 from github/remove-upstream-dupes
Replace custom `RailsApplicationRecord` and `RailsRenderInline` cops with their upstream equivalent
2 parents 1567efb + fb20774 commit 2a2a9d0

File tree

7 files changed

+2
-197
lines changed

7 files changed

+2
-197
lines changed

config/rails.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ require:
22
- rubocop-github-rails
33
- rubocop-rails
44

5-
GitHub/RailsApplicationRecord:
6-
Enabled: true
7-
85
GitHub/RailsControllerRenderActionSymbol:
96
Enabled: true
107

@@ -17,9 +14,6 @@ GitHub/RailsControllerRenderPathsExist:
1714
GitHub/RailsControllerRenderShorthand:
1815
Enabled: true
1916

20-
GitHub/RailsRenderInline:
21-
Enabled: true
22-
2317
GitHub/RailsRenderObjectCollection:
2418
Enabled: false
2519

@@ -94,7 +88,7 @@ Rails/ApplicationMailer:
9488
Enabled: false
9589

9690
Rails/ApplicationRecord:
97-
Enabled: false
91+
Enabled: true
9892

9993
Rails/ArelStar:
10094
Enabled: false
@@ -307,7 +301,7 @@ Rails/RelativeDateConstant:
307301
Enabled: false
308302

309303
Rails/RenderInline:
310-
Enabled: false
304+
Enabled: true
311305

312306
Rails/RenderPlainText:
313307
Enabled: false

config/rails_cops.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
GitHub/RailsApplicationRecord:
2-
Enabled: pending
3-
41
GitHub/RailsControllerRenderActionSymbol:
52
Enabled: pending
63
Include:

guides/rails-render-inline.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

lib/rubocop/cop/github/rails_application_record.rb

Lines changed: 0 additions & 29 deletions
This file was deleted.

lib/rubocop/cop/github/rails_render_inline.rb

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/test_rails_application_record.rb

Lines changed: 0 additions & 39 deletions
This file was deleted.

test/test_rails_render_inline.rb

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)