summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-05-15 22:59:14 -0700
committerStan Hu <stanhu@gmail.com>2019-05-15 22:59:14 -0700
commitd799af10d8a33f79273c66419c9a43d6d5f6c008 (patch)
tree62c3496c8ae97acf52cf84e555da06477af80c69 /Gemfile
parent3d2edaac04ec1e4d5074a43249c11cf6e8a8eecf (diff)
downloadgitlab-ce-d799af10d8a33f79273c66419c9a43d6d5f6c008.tar.gz
Update Rubocop to 0.69.0 and other gems
This fixes Ruby 2.6.x parser warnings: https://github.com/rubocop-hq/rubocop/pull/7009
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 19432758b34..cbf0a67f66f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -351,9 +351,9 @@ group :development, :test do
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
- gem 'gitlab-styles', '~> 2.6', require: false
+ gem 'gitlab-styles', '~> 2.7', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.68.1'
+ gem 'rubocop', '~> 0.69.0'
gem 'rubocop-performance', '~> 1.1.0'
gem 'rubocop-rspec', '~> 1.22.1'