Skip to content

Commit 54a1ccf

Browse files
committed
Merge pull request #332 from ryanfox1985/develop
Reduce rubocop offenses and don't include activeadmin models by default
2 parents 3e441d1 + 036ee58 commit 54a1ccf

21 files changed

+541
-594
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.bundle
66
.gems
77
.rbenv-version
8+
.ruby-*
89
/.idea/
910
/.rbx
1011
/.rvmrc

.rubocop.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
inherit_from: ./.rubocop_todo.yml
22

33
AllCops:
4-
Include:
5-
- '**/Rakefile'
6-
- '**/config.ru'
74
Exclude:
8-
- 'bin/**/*'
5+
- 'vendor/**/*'
6+
- 'spec/fixtures/**/*'
7+
- 'tmp/**/*'

0 commit comments

Comments
 (0)