diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-10 11:40:30 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-10 11:40:30 +0000 |
| commit | 8c9ccc3d6e52212970ba700cfa4e98b1875aaede (patch) | |
| tree | fcf145bdef4c0f9923b5fa7790f52d83be8e6e7d /Gemfile.lock | |
| parent | e93cd61793020128ae2f577b20d8e4cc2313ce8b (diff) | |
| parent | 23316b4963da5dd0173498904a2cd428ed2b0778 (diff) | |
| download | gitlab-ce-8c9ccc3d6e52212970ba700cfa4e98b1875aaede.tar.gz | |
Merge branch 'update-rubocop' into 'master'
Update rubocop and rubocop-rspec to fix build errors
See merge request !8466
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 38c52e47299..cb71a468aa1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -649,14 +649,14 @@ GEM rspec-retry (0.4.5) rspec-core rspec-support (3.5.0) - rubocop (0.43.0) + rubocop (0.46.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.5.0) - rubocop (>= 0.40.0) + rubocop-rspec (1.9.1) + rubocop (>= 0.42.0) ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (0.16.2) @@ -975,7 +975,7 @@ DEPENDENCIES rspec-rails (~> 3.5.0) rspec-retry (~> 0.4.5) rubocop (~> 0.43.0) - rubocop-rspec (~> 1.5.0) + rubocop-rspec (~> 1.9.1) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.16.2) rugged (~> 0.24.0) |