diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-15 08:14:01 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-15 08:14:01 +0000 |
| commit | 08b48b7d3ba1e86f33199a94ba8d401e051fed57 (patch) | |
| tree | 47ce1f2217103c7e3af92a9c5e6c6f0ededc8352 /Gemfile.lock | |
| parent | 0a8b66302c2869a369a3a563c7093939487a2b25 (diff) | |
| parent | 287293bec1a1e6fc4ffbe84e05ddddf5f48bd8ab (diff) | |
| download | gitlab-ce-08b48b7d3ba1e86f33199a94ba8d401e051fed57.tar.gz | |
Merge branch 'rs-update-rubocop' into 'master'
Bump rubocop to 0.42.0
Also updates `.rubocop_todo.yml` for the latest cops.
See merge request !6354
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index cecd87e2e2b..e2b5a58d973 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -619,7 +619,7 @@ GEM rspec-retry (0.4.5) rspec-core rspec-support (3.5.0) - rubocop (0.41.2) + rubocop (0.42.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) @@ -762,7 +762,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.1.0) + unicode-display_width (1.1.1) unicorn (4.9.0) kgio (~> 2.6) rack @@ -944,7 +944,7 @@ DEPENDENCIES rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.5.0) rspec-retry (~> 0.4.5) - rubocop (~> 0.41.2) + rubocop (~> 0.42.0) rubocop-rspec (~> 1.5.0) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.15.9) |