Merge branch 'master' into rtorre/delete-unused-do-metadata-connection

NEWS.md

@@ -30,6 +30,7 @@ sudo make install
 - Split configuration for Message Broker & Central login redirection [#16150](https://github.com/CartoDB/cartodb/pull/16150)
 - Remove Data Library gallery page (now redirected to Spatial Data Catalog) [#16133](https://github.com/CartoDB/cartodb/pull/16133)
 - Sync DO API keys betwenn onpremises & CARTO-managed clouds [#16205](https://github.com/CartoDB/cartodb/pull/16205)
+- Fix master build [#16213](https://github.com/CartoDB/cartodb/pull/16213)
 
 ### Bug fixes / enhancements
 

lib/cartodb/hubspot.rb

@@ -8,7 +8,6 @@ module CartoDB
   class Hubspot
 
     include Singleton
-    include ::LoggerHelper
 
     attr_reader :event_ids, :form_ids, :token
 
@@ -60,7 +59,7 @@ module CartoDB
       response = get_events("/v1/event/?_a=#{@token}&_n=#{event_id}&email=#{payload[:email]}")
 
       unless (!response.nil? && response.code == 200)
-        log_error(message: 'Hubspot error tracking event', payload: payload, event: { id: event_id })
+        Rails.logger.error(message: 'Hubspot error tracking event', payload: payload, event: { id: event_id })
       end
 
       self
@@ -91,7 +90,7 @@ module CartoDB
 
       response
     rescue StandardError => e
-      log_error(exception: e, request: { url: url, body: content }, error_detail: response)
+      Rails.logger.error(exception: e, request: { url: url, body: content }, error_detail: response.inspect)
       nil
     end
 

script/ci/runParallelTests.sh

@@ -3,9 +3,9 @@
 WORKERS=${1:-22}
 
 syntax_errors=0
-# check syntax of modified Ruby files before running tests 
-for i in $(git diff --name-only origin/master -- "*.rb" ); 
-    do echo $i; ruby -c $i || ((syntax_errors=syntax_errors+1)); 
+# check syntax of modified Ruby files before running tests
+for i in $(git diff --name-only origin/master -- "*.rb" );
+    do echo $i; ruby -c $i || ((syntax_errors=syntax_errors+1));
 done
 if [ $syntax_errors -gt 0 ]
 then

spec/requests/sessions_spec.rb

@@ -16,6 +16,7 @@ feature "Sessions" do
 
   after do
     Carto::UserMultifactorAuth.delete_all
+    Carto::FeatureFlagsUser.delete_all
     Carto::User.delete_all
     Carto::Ldap::Configuration.delete_all
     Carto::Organization.delete_all