From 6241182397ed7722db19b0f7499bc637747c3249 Mon Sep 17 00:00:00 2001 From: Gonzalo Riestra Date: Wed, 8 Jul 2020 12:47:26 +0200 Subject: [PATCH 1/5] upgrade rails to 4.2.11.3 --- Gemfile | 2 +- Gemfile.lock | 78 +++++++++---------- gears/carto_gears_api/Gemfile.lock | 22 +++--- gears/carto_gears_api/carto_gears_api.gemspec | 2 +- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Gemfile b/Gemfile index f72faa0f55..0b21f738a8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '4.2.11' +gem 'rails', '4.2.11.3' gem 'rake', '0.9.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index deac2dcd67..fbe175208b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,40 +25,40 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) + actionmailer (4.2.11.3) + actionpack (= 4.2.11.3) + actionview (= 4.2.11.3) + activejob (= 4.2.11.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.11) - actionview (= 4.2.11) - activesupport (= 4.2.11) + actionpack (4.2.11.3) + actionview (= 4.2.11.3) + activesupport (= 4.2.11.3) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11) - activesupport (= 4.2.11) + actionview (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.11) - activesupport (= 4.2.11) + activejob (4.2.11.3) + activesupport (= 4.2.11.3) globalid (>= 0.3.0) - activemodel (4.2.11) - activesupport (= 4.2.11) + activemodel (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) - activerecord (4.2.11) - activemodel (= 4.2.11) - activesupport (= 4.2.11) + activerecord (4.2.11.3) + activemodel (= 4.2.11.3) + activesupport (= 4.2.11.3) arel (~> 6.0) activerecord-nulldb-adapter (0.3.1) activerecord (>= 2.0.0) activerecord-postgresql-adapter (0.0.1) pg - activesupport (4.2.11) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -93,7 +93,7 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - builder (3.2.3) + builder (3.2.4) byebug (8.2.2) capybara (2.18.0) addressable @@ -124,7 +124,7 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.6) crass (1.0.6) daemons (1.2.4) db-query-matchers (0.4.0) @@ -239,7 +239,7 @@ GEM json-schema (2.1.9) jwt (2.2.1) kgio (2.10.0) - loofah (2.3.1) + loofah (2.6.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -251,9 +251,9 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) - mini_mime (1.0.1) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.14.1) mocha (1.1.0) metaclass (~> 0.0.1) mock_redis (0.16.0) @@ -265,7 +265,7 @@ GEM net-ldap (0.16.0) net-telnet (0.1.1) netaddr (2.0.4) - nokogiri (1.10.9) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) oauth (0.4.7) oauth2 (1.4.2) @@ -290,21 +290,21 @@ GEM byebug (~> 8.0) pry (~> 0.10) public_suffix (3.0.3) - rack (1.6.12) + rack (1.6.13) rack-protection (1.5.5) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.11) - actionmailer (= 4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) - activemodel (= 4.2.11) - activerecord (= 4.2.11) - activesupport (= 4.2.11) + rails (4.2.11.3) + actionmailer (= 4.2.11.3) + actionpack (= 4.2.11.3) + actionview (= 4.2.11.3) + activejob (= 4.2.11.3) + activemodel (= 4.2.11.3) + activerecord (= 4.2.11.3) + activesupport (= 4.2.11.3) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.11) + railties (= 4.2.11.3) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -316,9 +316,9 @@ GEM loofah (~> 2.3) rails_warden (0.5.8) warden (>= 1.0.0) - railties (4.2.11) - actionpack (= 4.2.11) - activesupport (= 4.2.11) + railties (4.2.11.3) + actionpack (= 4.2.11.3) + activesupport (= 4.2.11.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.15.0) @@ -436,13 +436,13 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) tilt (2.0.6) trollop (2.1.2) typhoeus (1.3.1) ethon (>= 0.9.0) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) uber (0.1.0) unf (0.1.4) @@ -521,7 +521,7 @@ DEPENDENCIES pry-byebug (= 3.3.0) rack rack-test (= 0.6.3) - rails (= 4.2.11) + rails (= 4.2.11.3) rails_warden (= 0.5.8) raindrops (= 0.15.0) rake (= 0.9.2.2) diff --git a/gears/carto_gears_api/Gemfile.lock b/gears/carto_gears_api/Gemfile.lock index 49d2d2089d..8df564f77f 100644 --- a/gears/carto_gears_api/Gemfile.lock +++ b/gears/carto_gears_api/Gemfile.lock @@ -45,17 +45,17 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.4) - builder (3.2.3) + builder (3.2.4) byebug (10.0.2) - concurrent-ruby (1.1.4) - crass (1.0.5) + concurrent-ruby (1.1.6) + crass (1.0.6) diff-lcs (1.1.3) erubis (2.7.0) globalid (0.4.2) activesupport (>= 4.2.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - loofah (2.4.0) + loofah (2.6.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -63,13 +63,13 @@ GEM metaclass (0.0.4) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.14.1) mocha (1.1.0) metaclass (~> 0.0.1) - nokogiri (1.10.8) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) pg (0.20.0) - rack (1.6.12) + rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) rails (4.2.11) @@ -89,8 +89,8 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) railties (4.2.11) actionpack (= 4.2.11) activesupport (= 4.2.11) @@ -115,9 +115,9 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) values (1.8.0) diff --git a/gears/carto_gears_api/carto_gears_api.gemspec b/gears/carto_gears_api/carto_gears_api.gemspec index 11dd49abcf..5bd7d9809a 100644 --- a/gears/carto_gears_api/carto_gears_api.gemspec +++ b/gears/carto_gears_api/carto_gears_api.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.test_files = Dir["test/**/*"] s.add_dependency 'pg', '0.20.0' - s.add_dependency "rails", "4.2.11" + s.add_dependency "rails", "4.2.11.3" s.add_dependency 'sprockets', '3.7.2' s.add_dependency 'values', '1.8.0' end From 68718dfb0ec20dff85094137a91a8e9b4e1bc15c Mon Sep 17 00:00:00 2001 From: Gonzalo Riestra Date: Wed, 8 Jul 2020 12:50:20 +0200 Subject: [PATCH 2/5] news --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index ffdee19702..ff42c4a97e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -20,6 +20,7 @@ Development - Fix navigation bar tests - Ignore update_timestamp function on migrations ([#15710](https://github.com/CartoDB/cartodb/pull/15710)) - Improve query builder performance ([#15725](https://github.com/CartoDB/cartodb/pull/15725)) +- Upgrade rails to 4.2.11.3 ([#15737](https://github.com/CartoDB/cartodb/pull/15737)) 4.38.0 (2020-06-05) ------------------- From d09eb94b41549549ce2cb31c22d8dd8ddc02708c Mon Sep 17 00:00:00 2001 From: Gonzalo Riestra Date: Thu, 9 Jul 2020 14:16:10 +0200 Subject: [PATCH 3/5] update gemfile.lock from carto gears api --- gears/carto_gears_api/Gemfile.lock | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/gears/carto_gears_api/Gemfile.lock b/gears/carto_gears_api/Gemfile.lock index 8df564f77f..97bea01a9f 100644 --- a/gears/carto_gears_api/Gemfile.lock +++ b/gears/carto_gears_api/Gemfile.lock @@ -3,43 +3,43 @@ PATH specs: carto_gears_api (0.0.6) pg (= 0.20.0) - rails (= 4.2.11) + rails (= 4.2.11.3) sprockets (= 3.7.2) values (= 1.8.0) GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) + actionmailer (4.2.11.3) + actionpack (= 4.2.11.3) + actionview (= 4.2.11.3) + activejob (= 4.2.11.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.11) - actionview (= 4.2.11) - activesupport (= 4.2.11) + actionpack (4.2.11.3) + actionview (= 4.2.11.3) + activesupport (= 4.2.11.3) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11) - activesupport (= 4.2.11) + actionview (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.11) - activesupport (= 4.2.11) + activejob (4.2.11.3) + activesupport (= 4.2.11.3) globalid (>= 0.3.0) - activemodel (4.2.11) - activesupport (= 4.2.11) + activemodel (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) - activerecord (4.2.11) - activemodel (= 4.2.11) - activesupport (= 4.2.11) + activerecord (4.2.11.3) + activemodel (= 4.2.11.3) + activesupport (= 4.2.11.3) arel (~> 6.0) - activesupport (4.2.11) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -72,16 +72,16 @@ GEM rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.11) - actionmailer (= 4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) - activemodel (= 4.2.11) - activerecord (= 4.2.11) - activesupport (= 4.2.11) + rails (4.2.11.3) + actionmailer (= 4.2.11.3) + actionpack (= 4.2.11.3) + actionview (= 4.2.11.3) + activejob (= 4.2.11.3) + activemodel (= 4.2.11.3) + activerecord (= 4.2.11.3) + activesupport (= 4.2.11.3) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.11) + railties (= 4.2.11.3) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -91,9 +91,9 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (4.2.11) - actionpack (= 4.2.11) - activesupport (= 4.2.11) + railties (4.2.11.3) + actionpack (= 4.2.11.3) + activesupport (= 4.2.11.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (13.0.1) @@ -132,4 +132,4 @@ DEPENDENCIES rspec-rails (= 2.12.0) BUNDLED WITH - 2.1.4 + 1.17.3 From 477f606d386b271197e7e57f241125f3b7546867 Mon Sep 17 00:00:00 2001 From: Gonzalo Riestra Date: Thu, 9 Jul 2020 14:20:40 +0200 Subject: [PATCH 4/5] fix gemfile.lock --- gears/carto_gears_api/Gemfile.lock | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/gears/carto_gears_api/Gemfile.lock b/gears/carto_gears_api/Gemfile.lock index 97bea01a9f..8df564f77f 100644 --- a/gears/carto_gears_api/Gemfile.lock +++ b/gears/carto_gears_api/Gemfile.lock @@ -3,43 +3,43 @@ PATH specs: carto_gears_api (0.0.6) pg (= 0.20.0) - rails (= 4.2.11.3) + rails (= 4.2.11) sprockets (= 3.7.2) values (= 1.8.0) GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.11.3) - actionpack (= 4.2.11.3) - actionview (= 4.2.11.3) - activejob (= 4.2.11.3) + actionmailer (4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.11.3) - actionview (= 4.2.11.3) - activesupport (= 4.2.11.3) + actionpack (4.2.11) + actionview (= 4.2.11) + activesupport (= 4.2.11) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11.3) - activesupport (= 4.2.11.3) + actionview (4.2.11) + activesupport (= 4.2.11) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.11.3) - activesupport (= 4.2.11.3) + activejob (4.2.11) + activesupport (= 4.2.11) globalid (>= 0.3.0) - activemodel (4.2.11.3) - activesupport (= 4.2.11.3) + activemodel (4.2.11) + activesupport (= 4.2.11) builder (~> 3.1) - activerecord (4.2.11.3) - activemodel (= 4.2.11.3) - activesupport (= 4.2.11.3) + activerecord (4.2.11) + activemodel (= 4.2.11) + activesupport (= 4.2.11) arel (~> 6.0) - activesupport (4.2.11.3) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -72,16 +72,16 @@ GEM rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.11.3) - actionmailer (= 4.2.11.3) - actionpack (= 4.2.11.3) - actionview (= 4.2.11.3) - activejob (= 4.2.11.3) - activemodel (= 4.2.11.3) - activerecord (= 4.2.11.3) - activesupport (= 4.2.11.3) + rails (4.2.11) + actionmailer (= 4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) + activemodel (= 4.2.11) + activerecord (= 4.2.11) + activesupport (= 4.2.11) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.11.3) + railties (= 4.2.11) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -91,9 +91,9 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (4.2.11.3) - actionpack (= 4.2.11.3) - activesupport (= 4.2.11.3) + railties (4.2.11) + actionpack (= 4.2.11) + activesupport (= 4.2.11) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (13.0.1) @@ -132,4 +132,4 @@ DEPENDENCIES rspec-rails (= 2.12.0) BUNDLED WITH - 1.17.3 + 2.1.4 From 8e17df193dbe6a84dcc958c83caeb956486d2bed Mon Sep 17 00:00:00 2001 From: Gonzalo Riestra Date: Thu, 9 Jul 2020 14:22:06 +0200 Subject: [PATCH 5/5] fix gemfile.lock --- gears/carto_gears_api/Gemfile.lock | 60 +++++++++++++++--------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/gears/carto_gears_api/Gemfile.lock b/gears/carto_gears_api/Gemfile.lock index 8df564f77f..a33b467dff 100644 --- a/gears/carto_gears_api/Gemfile.lock +++ b/gears/carto_gears_api/Gemfile.lock @@ -3,43 +3,43 @@ PATH specs: carto_gears_api (0.0.6) pg (= 0.20.0) - rails (= 4.2.11) + rails (= 4.2.11.3) sprockets (= 3.7.2) values (= 1.8.0) GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) + actionmailer (4.2.11.3) + actionpack (= 4.2.11.3) + actionview (= 4.2.11.3) + activejob (= 4.2.11.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.11) - actionview (= 4.2.11) - activesupport (= 4.2.11) + actionpack (4.2.11.3) + actionview (= 4.2.11.3) + activesupport (= 4.2.11.3) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11) - activesupport (= 4.2.11) + actionview (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.11) - activesupport (= 4.2.11) + activejob (4.2.11.3) + activesupport (= 4.2.11.3) globalid (>= 0.3.0) - activemodel (4.2.11) - activesupport (= 4.2.11) + activemodel (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) - activerecord (4.2.11) - activemodel (= 4.2.11) - activesupport (= 4.2.11) + activerecord (4.2.11.3) + activemodel (= 4.2.11.3) + activesupport (= 4.2.11.3) arel (~> 6.0) - activesupport (4.2.11) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -72,16 +72,16 @@ GEM rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.11) - actionmailer (= 4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) - activemodel (= 4.2.11) - activerecord (= 4.2.11) - activesupport (= 4.2.11) + rails (4.2.11.3) + actionmailer (= 4.2.11.3) + actionpack (= 4.2.11.3) + actionview (= 4.2.11.3) + activejob (= 4.2.11.3) + activemodel (= 4.2.11.3) + activerecord (= 4.2.11.3) + activesupport (= 4.2.11.3) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.11) + railties (= 4.2.11.3) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -91,9 +91,9 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (4.2.11) - actionpack (= 4.2.11) - activesupport (= 4.2.11) + railties (4.2.11.3) + actionpack (= 4.2.11.3) + activesupport (= 4.2.11.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (13.0.1)