Merge branch 'sh-upgrade-rubocop-0.68.0-ce' into 'master'
Upgrade to Rubocop 0.68.1 See merge request gitlab-org/gitlab-ce!28046
Showing
This diff is collapsed.
... | @@ -349,13 +349,14 @@ group :development, :test do | ... | @@ -349,13 +349,14 @@ group :development, :test do |
gem 'spring', '~> 2.0.0' | gem 'spring', '~> 2.0.0' | ||
gem 'spring-commands-rspec', '~> 1.0.4' | 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 | # 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 'rubocop-rspec', '~> 1.22.1' | ||
gem 'scss_lint', '~> 0.56.0', require: false | gem 'scss_lint', '~> 0.56.0', require: false | ||
gem 'haml_lint', '~> 0.28.0', require: false | gem 'haml_lint', '~> 0.30.0', require: false | ||
gem 'simplecov', '~> 0.14.0', require: false | gem 'simplecov', '~> 0.14.0', require: false | ||
gem 'bundler-audit', '~> 0.5.0', require: false | gem 'bundler-audit', '~> 0.5.0', require: false | ||
... | ... |
Please register or sign in to comment