diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-05-16 12:53:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-05-16 12:53:08 +0000 |
| commit | fcc810a1d91d0c2e6cf9726b943e06ee64b97a60 (patch) | |
| tree | f00755d731095b9dea23f8c0434fe9828b8ee105 /Gemfile | |
| parent | 71244a7962ea642536138f98d49379ab5c0111a3 (diff) | |
| parent | 96137d554f0cfd86f7d929ec085afb2858960563 (diff) | |
| download | gitlab-ce-fcc810a1d91d0c2e6cf9726b943e06ee64b97a60.tar.gz | |
Merge branch 'sh-update-rubocop-and-gitlab-styles-ce' into 'master'
Update Rubocop to 0.69.0 and other gems
See merge request gitlab-org/gitlab-ce!28345
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -353,9 +353,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' |