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