summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-07-15 17:19:38 +0000
committerRobert Speicher <robert@gitlab.com>2016-07-15 17:19:38 +0000
commitdfea11e1e791d0343ccc7d560f03710f5c1e2a98 (patch)
treed8eb21ac63415cb5cd0e3171677fc059d21c01d8 /Gemfile
parent8b7932c21951de172d531ab8a3e9506c98db7483 (diff)
parent82c500a2b69e985cb12ce89964c6ebdd289a0d23 (diff)
downloadgitlab-ce-dfea11e1e791d0343ccc7d560f03710f5c1e2a98.tar.gz
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')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index ee23f712f05..ecbf6fd3dc4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -299,7 +299,7 @@ group :development, :test do
gem 'spring-commands-spinach', '~> 1.1.0'
gem 'spring-commands-teaspoon', '~> 0.0.2'
- gem 'rubocop', '~> 0.40.0', require: false
+ gem 'rubocop', '~> 0.41.2', require: false
gem 'rubocop-rspec', '~> 1.5.0', require: false
gem 'scss_lint', '~> 0.47.0', require: false
gem 'simplecov', '~> 0.11.0', require: false