Merge pull request #16305 from CartoDB/fix-rubocop-ci-hook

Fix Rubocop CI hook
pull/16300/head
Shylpx 3 years ago committed by GitHub
commit af6b7e23cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -14,7 +14,7 @@ jobs:
- name: Rubocop linter
uses: reviewdog/action-rubocop@v1
with:
rubocop_version: 0.93.1
rubocop_version: 1.12.1
github_token: ${{ secrets.github_token }}
reporter: github-pr-check
level: error

@ -121,7 +121,7 @@ group :development, :test do
gem 'pry-byebug', '3.9.0'
gem 'rack'
gem 'rb-readline'
gem 'rubocop', '~> 0.93', require: false
gem 'rubocop', '~> 1.12.0', require: false
gem 'rubocop-performance', require: false
gem 'rubocop-rails', require: false
gem 'rubocop-rspec', require: false

@ -302,7 +302,7 @@ GEM
parallel (1.20.1)
parallel_tests (3.5.2)
parallel
parser (3.0.0.0)
parser (3.0.1.1)
ast (~> 2.4.1)
pg (0.20.0)
poltergeist (1.18.1)
@ -404,17 +404,17 @@ GEM
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rubocop (0.93.1)
rubocop (1.12.1)
parallel (~> 1.10)
parser (>= 2.7.1.5)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 0.6.0)
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.4.1)
parser (>= 2.7.1.5)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.7.0)
parser (>= 3.0.1.1)
rubocop-performance (1.10.1)
rubocop (>= 0.90.0, < 2.0)
rubocop-ast (>= 0.4.0)
@ -422,9 +422,9 @@ GEM
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 0.90.0, < 2.0)
rubocop-rspec (1.44.1)
rubocop (~> 0.87)
rubocop-ast (>= 0.7.1)
rubocop-rspec (2.4.0)
rubocop (~> 1.0)
rubocop-ast (>= 1.1.0)
ruby-ole (1.2.12.2)
ruby-prof (1.4.1)
ruby-progressbar (1.11.0)
@ -494,7 +494,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
unicode-display_width (2.0.0)
unicorn (4.8.2)
kgio (~> 2.6)
rack
@ -590,7 +590,7 @@ DEPENDENCIES
rotp (~> 3.3, >= 3.3.1)
rqrcode (~> 0.10.1)
rspec-rails (= 2.12.0)
rubocop (~> 0.93)
rubocop (~> 1.12.0)
rubocop-performance
rubocop-rails
rubocop-rspec

@ -28,6 +28,7 @@ Development
- Fix subscription/sample filter for datasets [#16254](https://github.com/CartoDB/cartodb/pull/16254)
- Use fully qualified table name while creating a new map from a shared dataset [#16241](https://github.com/CartoDB/cartodb/pull/16241)
- Add new events for DO full access [#16290](https://github.com/CartoDB/cartodb/pull/16290)
- Bump Rubocop to v1.12.1 to fix the CI hook [#16305](https://github.com/CartoDB/cartodb/pull/16305)
- Fix an issue that prevents API OPTIONS from succeeding because of undue CSRF check [#16292](https://github.com/CartoDB/cartodb/pull/16292)
- Fix a regression test and add some warnings to source code [#16297](https://github.com/CartoDB/cartodb/pull/16297)

@ -515,4 +515,5 @@ class ApplicationController < ActionController::Base
headers['X-XSS-Protection'] = '1; mode=block'
headers['X-Content-Type-Options'] = 'nosniff'
end
end

Loading…
Cancel
Save