Skip to content

Commit

Permalink
Merge 318b0fc into 37b7201
Browse files Browse the repository at this point in the history
  • Loading branch information
olbrich committed Jul 21, 2019
2 parents 37b7201 + 318b0fc commit ee37572
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 42 deletions.
18 changes: 5 additions & 13 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,13 @@ checks:
plugins:
rubocop:
enabled: true
channel: rubocop-0-66
channel: rubocop-0-71
markdownlint:
enabled: true
brakeman:
enabled: true
exclude_patterns:
- "config/"
- "db/"
- "dist/"
- "features/"
- "**/node_modules/"
- "script/"
- "**/spec/"
- "**/test/"
- "**/tests/"
- "**/vendor/"
- "**/*.d.ts"
- "gemfiles/"
- "Gemfile"
- "bin/*"
- "gemfiles/*"
- "test/**/*"
13 changes: 3 additions & 10 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
AllCops:
TargetRubyVersion: 2.4
Include:
- '**/Rakefile'
- '**/config.ru'
- 'lib/tasks/**/*'
Exclude:
- Gemfile*
- README
- 'db/**/*'
- 'config/**/*'
- 'bin/**/*'
- 'vendor/bundle/**/*'
- 'spec/support/**/*' # rspec support helpers have a strange api
- bin/*
- gemfiles/*
- test/**/*

Rails:
Enabled: true
Expand Down
36 changes: 18 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
devise-security (0.14.2)
devise-security (0.14.3)
devise (>= 4.3.0, < 5.0)
rails (>= 4.2.0, < 7.0)

Expand Down Expand Up @@ -55,7 +55,7 @@ GEM
thor (>= 0.14.0)
arel (9.0.0)
ast (2.4.0)
bcrypt (3.1.12)
bcrypt (3.1.13)
bson (4.5.0)
builder (3.2.3)
byebug (11.0.1)
Expand All @@ -76,7 +76,7 @@ GEM
responders
warden (~> 1.2.3)
diff-lcs (1.3)
docile (1.3.1)
docile (1.3.2)
easy_captcha (0.6.5)
bundler (>= 1.1.0)
rails (>= 3.0.0)
Expand Down Expand Up @@ -105,15 +105,15 @@ GEM
mimemagic (~> 0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
mongo (2.9.0)
bson (>= 4.4.2, < 5.0.0)
mongoid (7.0.4)
activemodel (>= 5.1, < 6.0.0)
mongo (>= 2.5.1, < 3.0.0)
nio4r (2.3.1)
nio4r (2.4.0)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
omniauth (1.9.0)
Expand Down Expand Up @@ -163,16 +163,16 @@ GEM
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rmagick (3.1.0)
rspec-core (3.8.0)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
rmagick (4.0.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.3)
rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
rspec-mocks (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.2)
Expand All @@ -183,8 +183,8 @@ GEM
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.73.0)
rspec-support (3.8.2)
rubocop (0.71.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
Expand All @@ -209,15 +209,15 @@ GEM
tins (~> 1.0)
thor (0.20.3)
thread_safe (0.3.6)
tins (1.20.2)
tins (1.21.1)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
warden (1.2.8)
rack (>= 2.0.6)
websocket-driver (0.7.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
websocket-extensions (0.1.4)
wwtd (1.3.0)
yard (0.9.20)

Expand All @@ -238,7 +238,7 @@ DEPENDENCIES
pry-byebug
pry-rescue
rails_email_validator
rubocop (~> 0.73.0)
rubocop (~> 0.71.0)
sqlite3 (~> 1.3.0)
wwtd

Expand Down
2 changes: 1 addition & 1 deletion devise-security.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'pry-byebug'
s.add_development_dependency 'pry-rescue'
s.add_development_dependency 'rails_email_validator'
s.add_development_dependency 'rubocop', '~> 0.73.0'
s.add_development_dependency 'rubocop', '~> 0.71.0' # NOTE: also update .codeclimate.yml and make sure it uses the same version
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'wwtd'
end

0 comments on commit ee37572

Please sign in to comment.