Merge branch 'main' into ojtjo3-codex/update-favicon-and-title-on-page-load

Author: rsmithlal

Gemfile.lock

@@ -407,7 +407,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.13.0)
+    json (2.13.2)
     json-schema (5.1.1)
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
@@ -493,7 +493,7 @@ GEM
     optimist (3.2.1)
     orm_adapter (0.5.0)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     pg (1.6.1-aarch64-linux)
@@ -604,7 +604,7 @@ GEM
     reform-rails (0.2.6)
       activemodel (>= 5.0)
       reform (>= 2.3.1, < 3.0.0)
-    regexp_parser (2.10.0)
+    regexp_parser (2.11.0)
     reline (0.6.2)
       io-console (~> 0.5)
     representable (3.2.0)
@@ -658,18 +658,18 @@ GEM
     rswag-ui (2.16.0)
       actionpack (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
-    rubocop (1.78.0)
+    rubocop (1.79.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.1, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)

app/controllers/better_together/static_page_template_controller.rb

@@ -8,6 +8,7 @@ class StaticPageTemplateController < AbstractController::Base
     include AbstractController::Helpers
     include AbstractController::Translation
     include AbstractController::AssetPaths
+
     # include ActionController::UrlWriter
 
     # Uncomment if you want to use helpers

app/controllers/better_together/users/confirmations_controller.rb

@@ -4,6 +4,7 @@ module BetterTogether
   module Users
     class ConfirmationsController < ::Devise::ConfirmationsController # rubocop:todo Style/Documentation
       include DeviseLocales
+
       skip_before_action :check_platform_privacy
     end
   end

app/controllers/better_together/users/omniauth_callbacks_controller.rb

@@ -4,6 +4,7 @@ module BetterTogether
   module Users
     class OmniauthCallbacksController < ::Devise::OmniauthCallbacksController # rubocop:todo Style/Documentation
       include DeviseLocales
+
       skip_before_action :check_platform_privacy
     end
   end

app/controllers/better_together/users/passwords_controller.rb

@@ -4,6 +4,7 @@ module BetterTogether
   module Users
     class PasswordsController < ::Devise::PasswordsController # rubocop:todo Style/Documentation
       include DeviseLocales
+
       skip_before_action :check_platform_privacy
     end
   end

app/controllers/better_together/users/registrations_controller.rb

@@ -5,6 +5,7 @@ module Users
     # Override default Devise registrations controller
     class RegistrationsController < ::Devise::RegistrationsController
       include DeviseLocales
+
       skip_before_action :check_platform_privacy
 
       def new

app/controllers/better_together/users/sessions_controller.rb

@@ -4,6 +4,7 @@ module BetterTogether
   module Users
     class SessionsController < ::Devise::SessionsController # rubocop:todo Style/Documentation
       include DeviseLocales
+
       skip_before_action :check_platform_privacy
 
       def respond_to_on_destroy

app/controllers/better_together/users/unlocks_controller.rb

@@ -4,6 +4,7 @@ module BetterTogether
   module Users
     class UnlocksController < ::Devise::UnlocksController # rubocop:todo Style/Documentation
       include DeviseLocales
+
       skip_before_action :check_platform_privacy
     end
   end

app/future_controllers/better_together/api_controller.rb

@@ -7,6 +7,7 @@ module BetterTogether
   class ApiController < ::JSONAPI::ResourceController
     include Pundit::Authorization
     include Pundit::ResourceController
+
     protect_from_forgery with: :exception, unless: -> { request.format.json? }
   end
 end

app/helpers/better_together/application_helper.rb

@@ -6,6 +6,7 @@ module BetterTogether
   # platform configurations, and navigation items.
   module ApplicationHelper # rubocop:todo Metrics/ModuleLength
     include MetricsHelper
+
     # Returns the base URL configured for BetterTogether.
     def base_url
       ::BetterTogether.base_url