diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-09-21 14:32:25 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-09-21 14:32:25 +0300 |
| commit | 724eef629d720fd91e4fbc2822022742701dfacb (patch) | |
| tree | c95b7d84368f515d5394d07ac6590d8b0f5d09da /Gemfile.lock | |
| parent | 870324b5c02cd77b498857bb12007f7c7ab37a01 (diff) | |
| download | gitlab-ce-724eef629d720fd91e4fbc2822022742701dfacb.tar.gz | |
Revert "Merge branch 'rs-update-rubocop-rspec' into 'master'"rs-revert-rubocop-rspec-1-7
This reverts commit 70faf5fdfbfa0e427b12d4181a9302394974c3cf, reversing
changes made to 2307eb84dcd1748cc231719017551111310d1bf9.
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 c9b4b30c1f2..a5a2e5785ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -626,8 +626,8 @@ GEM rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.7.0) - rubocop (>= 0.42.0) + rubocop-rspec (1.5.0) + rubocop (>= 0.40.0) ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (0.15.9) @@ -943,7 +943,7 @@ DEPENDENCIES rspec-rails (~> 3.5.0) rspec-retry (~> 0.4.5) rubocop (~> 0.42.0) - rubocop-rspec (~> 1.7.0) + rubocop-rspec (~> 1.5.0) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.15.9) sanitize (~> 2.0) |