summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-05-02 21:40:40 -0700
committerStan Hu <stanhu@gmail.com>2019-05-05 03:24:27 -0700
commitd40298c8584fcd06b9549ab1674a3ec9c0ad9af0 (patch)
tree5c078a64a9130f3866a57ea5e5cf5680747511e6 /Gemfile
parent0ca245317aa8fda8fc3dbab8042f5d42a41a649c (diff)
downloadgitlab-ce-d40298c8584fcd06b9549ab1674a3ec9c0ad9af0.tar.gz
Upgrade to Rubocop 0.68.1
This adds Ruby 2.6 support.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 1faacc0801c..3a47b88bf15 100644
--- a/Gemfile
+++ b/Gemfile
@@ -349,9 +349,10 @@ group :development, :test do
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
- gem 'gitlab-styles', '~> 2.5', require: false
+ gem 'gitlab-styles', '~> 2.6', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.54.0'
+ gem 'rubocop', '~> 0.68.1'
+ gem 'rubocop-performance', '~> 1.1.0'
gem 'rubocop-rspec', '~> 1.22.1'
gem 'scss_lint', '~> 0.56.0', require: false