diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-15 20:19:38 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-15 20:19:38 +0300 |
| commit | dfea11e1e791d0343ccc7d560f03710f5c1e2a98 (patch) | |
| tree | d8eb21ac63415cb5cd0e3171677fc059d21c01d8 /Gemfile.lock | |
| parent | 8b7932c21951de172d531ab8a3e9506c98db7483 (diff) | |
| parent | 82c500a2b69e985cb12ce89964c6ebdd289a0d23 (diff) | |
Merge branch 'update-rubocop' into 'master'
Update rubocop to 0.41.2
Adds a couple of cops to the TODO files, but I wanted [a specific cop](https://github.com/bbatsov/rubocop/pull/3135/files) which just had about 65 offences, so Ill do that later.
See merge request !4999
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 67c0645c3d9..8430881e677 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,7 +58,7 @@ GEM faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) asciidoctor (1.5.3) - ast (2.2.0) + ast (2.3.0) attr_encrypted (3.0.1) encryptor (~> 3.0.0) attr_required (1.0.0) @@ -473,7 +473,7 @@ GEM orm_adapter (0.5.0) paranoia (2.1.4) activerecord (~> 4.0) - parser (2.3.1.0) + parser (2.3.1.2) ast (~> 2.2) pg (0.18.4) pkg-config (1.1.7) @@ -606,8 +606,8 @@ GEM rspec-retry (0.4.5) rspec-core rspec-support (3.5.0) - rubocop (0.40.0) - parser (>= 2.3.1.0, < 3.0) + rubocop (0.41.2) + parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) @@ -758,7 +758,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.0.5) + unicode-display_width (1.1.0) unicorn (4.9.0) kgio (~> 2.6) rack @@ -937,7 +937,7 @@ DEPENDENCIES rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.5.0) rspec-retry (~> 0.4.5) - rubocop (~> 0.40.0) + rubocop (~> 0.41.2) rubocop-rspec (~> 1.5.0) ruby-fogbugz (~> 0.2.1) sanitize (~> 2.0) |