consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3739 from consul/dependabot/bundler/rubocop-0.75.0

Browse Source 
Bump rubocop from 0.60.0 to 0.75.0
This commit is contained in:
Javier Martín
2019-10-08 13:20:01 +02:00
committed by GitHub
parent 4e37ef045e 19555442da
commit 2c80c05372
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.hound.yml
View File

@@ -1,5 +1,6 @@
rubocop: rubocop:
config_file: .rubocop_basic.yml config_file: .rubocop_basic.yml
version: 0.72.0
scss: scss:
config_file: .scss-lint.yml config_file: .scss-lint.yml
erblint: erblint:

7
.rubocop_basic.yml
View File

@@ -1,4 +1,7 @@
require: rubocop-rspec require:
- rubocop-performance
- rubocop-rails
- rubocop-rspec
AllCops: AllCops:
DisplayCopNames: true DisplayCopNames: true
@@ -30,7 +33,7 @@ FactoryBot/AttributeDefinedStatically:
Enabled: true Enabled: true
Layout/IndentationConsistency: Layout/IndentationConsistency:
EnforcedStyle: rails EnforcedStyle: indented_internal_methods
Layout/IndentationWidth: Layout/IndentationWidth:
Enabled: true Enabled: true

4
Gemfile
View File

@@ -96,7 +96,9 @@ group :development do
gem "capistrano3-delayed-job", "~> 1.7.3" gem "capistrano3-delayed-job", "~> 1.7.3"
gem "erb_lint", require: false gem "erb_lint", require: false
gem "mdl", "~> 0.5.0", require: false gem "mdl", "~> 0.5.0", require: false
gem "rubocop", "~> 0.60.0", require: false gem "rubocop", "~> 0.75.0", require: false
gem "rubocop-performance", "~> 1.4.1", require: false
gem "rubocop-rails", "~> 2.3.2", require: false
gem "rubocop-rspec", "~> 1.35.0", require: false gem "rubocop-rspec", "~> 1.35.0", require: false
gem "rvm1-capistrano3", "~> 1.4.0", require: false gem "rvm1-capistrano3", "~> 1.4.0", require: false
gem "scss_lint", "~> 0.55.0", require: false gem "scss_lint", "~> 0.55.0", require: false

19
Gemfile.lock
View File

@@ -387,7 +387,6 @@ GEM
activerecord (>= 4.2) activerecord (>= 4.2)
activesupport (>= 4.2) activesupport (>= 4.2)
arel (>= 6) arel (>= 6)
powerpack (0.1.2)
public_suffix (4.0.1) public_suffix (4.0.1)
puma (4.1.1) puma (4.1.1)
nio4r (~> 2.0) nio4r (~> 2.0)
@@ -460,14 +459,18 @@ GEM
rspec-mocks (~> 3.8.0) rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0) rspec-support (~> 3.8.0)
rspec-support (3.8.0) rspec-support (3.8.0)
rubocop (0.60.0) rubocop (0.75.0)
jaro_winkler (~> 1.5.1) jaro_winkler (~> 1.5.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1) parser (>= 2.6)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0) unicode-display_width (>= 1.4.0, < 1.7)
rubocop-performance (1.4.1)
rubocop (>= 0.71.0)
rubocop-rails (2.3.2)
rack (>= 1.1)
rubocop (>= 0.72.0)
rubocop-rspec (1.35.0) rubocop-rspec (1.35.0)
rubocop (>= 0.60.0) rubocop (>= 0.60.0)
ruby-progressbar (1.10.1) ruby-progressbar (1.10.1)
@@ -550,7 +553,7 @@ GEM
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (4.1.19) uglifier (4.1.19)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unicode-display_width (1.4.1) unicode-display_width (1.6.0)
unicorn (5.4.1) unicorn (5.4.1)
kgio (~> 2.6) kgio (~> 2.6)
raindrops (~> 0.7) raindrops (~> 0.7)
@@ -648,7 +651,9 @@ DEPENDENCIES
rinku (~> 2.0.2) rinku (~> 2.0.2)
rollbar (~> 2.18.0) rollbar (~> 2.18.0)
rspec-rails (~> 3.8) rspec-rails (~> 3.8)
rubocop (~> 0.60.0) rubocop (~> 0.75.0)
rubocop-performance (~> 1.4.1)
rubocop-rails (~> 2.3.2)
rubocop-rspec (~> 1.35.0) rubocop-rspec (~> 1.35.0)
rvm1-capistrano3 (~> 1.4.0) rvm1-capistrano3 (~> 1.4.0)
sass-rails (~> 5.0, >= 5.0.4) sass-rails (~> 5.0, >= 5.0.4)