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 | |
| 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')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -300,8 +300,8 @@ group :development, :test do gem 'spring-commands-spinach', '~> 1.1.0' gem 'spring-commands-teaspoon', '~> 0.0.2' - gem 'rubocop', '~> 0.43.0', require: false - gem 'rubocop-rspec', '~> 1.5.0', require: false + gem 'rubocop', '~> 0.46.0', require: false + gem 'rubocop-rspec', '~> 1.9.1', require: false gem 'scss_lint', '~> 0.47.0', require: false gem 'haml_lint', '~> 0.18.2', require: false gem 'simplecov', '0.12.0', require: false |