cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/3323'

Browse source
This commit is contained in:
Tom Hughes 2021-09-15 18:34:49 +01:00
commit 5f11c2d679
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -145,7 +145,7 @@ group :test do
gem "rubocop"
gem "rubocop-minitest"
gem "rubocop-performance"
gem "rubocop-rails"
gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2
gem "rubocop-rake"
gem "selenium-webdriver"
gem "simplecov", :require => false

4
Gemfile.lock
View file

@ -421,7 +421,7 @@ GEM
rubocop-performance (1.11.5)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.12.2)
rubocop-rails (2.11.3)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.7.0, < 2.0)
@ -560,7 +560,7 @@ DEPENDENCIES
rubocop
rubocop-minitest
rubocop-performance
rubocop-rails
rubocop-rails (~> 2.11.3)
rubocop-rake
sanitize
sassc-rails