Merge branch 'main' into dependabot/bundler/multi-808fc2ea4a

rsmithlal · web-flow · commit a479112dd32a · 2025-08-06T19:09:59.000-02:30
diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml
@@ -13,9 +13,9 @@ jobs:
           - ruby: '3.4.4'
             rails: '7.1.5.1'
             allowed_failure: false   # ✅ required
-          - ruby: '3.4.4'
-            rails: '7.2'
-            allowed_failure: true    # ⚠️ allowed to fail
+          # - ruby: '3.4.4'
+          #   rails: '7.2'
+          #   allowed_failure: true    # ⚠️ allowed to fail
           - ruby: '3.4.4'
             rails: '8.0'
             allowed_failure: true    # ⚠️ allowed to fail
diff --git a/AGENTS.md b/AGENTS.md
@@ -1,5 +1,7 @@
 # AGENTS.md
 
+Instructions for GitHub Copilot and other automated contributors working in this repository.
+
 ## Project
 - Ruby: 3.4.4 (installed via rbenv in setup)
 - Rails: 7.1
@@ -13,18 +15,17 @@
 - Databases:
   - development: `community_engine_development`
   - test: `community_engine_test`
-- Use `DATABASE_URL` to connect (overrides fallback host in database.yml).
+- Use `DATABASE_URL` to connect (overrides fallback host in `config/database.yml`).
 
 ## Commands
-- Run tests: `bin/ci`  
+- **Tests:** `bin/ci`
   (Equivalent: `cd spec/dummy && bundle exec rspec`)
-- Lint: `bundle exec rubocop`
-- Security: `bundle exec brakeman -q -w2` and `bundle exec bundler-audit --update`
+- **Lint:** `bundle exec rubocop`
+- **Security:** `bundle exec brakeman -q -w2` and `bundle exec bundler-audit --update`
+- **Style:** `bin/codex_style_guard`
 
 ## Conventions
 - Make incremental changes with passing tests.
 - Avoid introducing new external services in tests; stub where possible.
-
-## Code Style
-- Always run `bin/codex_style_guard` before proposing a patch.
-- If RuboCop reports offenses after autocorrect, update the changes until it passes.
+- If RuboCop reports offenses after autocorrect, update and rerun until clean.
+- Keep commit messages and PR descriptions concise and informative.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -161,19 +161,19 @@ GEM
       unf
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1139.0)
-    aws-sdk-core (3.228.0)
+    aws-partitions (1.1142.0)
+    aws-sdk-core (3.229.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.109.0)
+    aws-sdk-kms (1.110.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.195.0)
+    aws-sdk-s3 (1.196.1)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -651,7 +651,7 @@ GEM
     rswag-ui (2.16.0)
       actionpack (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
-    rubocop (1.79.1)
+    rubocop (1.79.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
diff --git a/app/controllers/better_together/static_page_template_controller.rb b/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
diff --git a/app/controllers/better_together/users/confirmations_controller.rb b/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
diff --git a/app/controllers/better_together/users/omniauth_callbacks_controller.rb b/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
diff --git a/app/controllers/better_together/users/passwords_controller.rb b/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
diff --git a/app/controllers/better_together/users/registrations_controller.rb b/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
diff --git a/app/controllers/better_together/users/sessions_controller.rb b/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
diff --git a/app/controllers/better_together/users/unlocks_controller.rb b/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
diff --git a/app/future_controllers/better_together/api_controller.rb b/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
diff --git a/app/helpers/better_together/application_helper.rb b/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
diff --git a/app/models/better_together/jwt_denylist.rb b/app/models/better_together/jwt_denylist.rb
@@ -4,6 +4,7 @@ module BetterTogether
   # Used to deny logins with expired JWT tokens
   class JwtDenylist < ApplicationRecord
     include Devise::JWT::RevocationStrategies::Denylist
+
     self.table_name = 'better_together_jwt_denylists'
   end
 end
diff --git a/app/models/better_together/user.rb b/app/models/better_together/user.rb
@@ -4,6 +4,7 @@ module BetterTogether
   # Authenticates the app user. Uses Devise.
   class User < ApplicationRecord
     include ::BetterTogether::DeviseUser
+
     # Include default devise modules. Others available are:
     # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
     devise :database_authenticatable, :registerable,
diff --git a/app/models/concerns/better_together/privacy.rb b/app/models/concerns/better_together/privacy.rb
@@ -14,8 +14,7 @@ module Privacy
       include ::TranslateEnum
 
       attribute :privacy, :string
-      enum privacy: PRIVACY_LEVELS,
-           _prefix: :privacy
+      enum :privacy, PRIVACY_LEVELS, prefix: :privacy
 
       translate_enum :privacy
 
diff --git a/app/models/concerns/better_together/searchable.rb b/app/models/concerns/better_together/searchable.rb
@@ -9,6 +9,7 @@ module Searchable
 
     included do
       include Elasticsearch::Model
+
       include Elasticsearch::Model::Callbacks unless Rails.env.test?
 
       after_commit :enqueue_index_document, if: :persisted?, unless: -> { Rails.env.test? }
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -14,7 +14,7 @@
   # confirmation, reset password and unlock tokens in the database.
   # Devise will use the `secret_key_base` as its `secret_key`
   # by default. You can change it below and use your own secret key.
-  config.secret_key = ENV.fetch('DEVISE_SECRET', nil)
+  config.secret_key = ENV.fetch('DEVISE_SECRET') { Rails.application.credentials.secret_key_base }
 
   config.pepper = ENV.fetch('DEVISE_PEPPER', nil)
 
diff --git a/config/initializers/public_activity.rb b/config/initializers/public_activity.rb
@@ -2,7 +2,7 @@
 
 # config/initializers/public_activity.rb
 
-# require 'better_togehter/privacy'
+# require 'better_together/privacy'
 
 ActiveSupport::Reloader.to_prepare do
   PublicActivity::Config.set do
diff --git a/lib/better_together/engine.rb b/lib/better_together/engine.rb
@@ -43,7 +43,8 @@ class Engine < ::Rails::Engine
     engine_name 'better_together'
     isolate_namespace BetterTogether
 
-    config.autoload_paths += Dir["#{config.root}/lib/better_together/**/"]
+    # Avoid modifying frozen autoload path arrays (Rails 8 compatibility)
+    config.autoload_paths = Array(config.autoload_paths) + Dir["#{root}/lib/better_together/**/"]
 
     config.generators do |g|
       g.orm :active_record, primary_key_type: :uuid
@@ -81,8 +82,9 @@ class Engine < ::Rails::Engine
     initializer 'better_together.action_mailer' do |app|
       if Rails.env.development?
         app.config.action_mailer.show_previews = true
-        app.config.action_mailer.preview_paths = app.config.action_mailer.preview_paths +
-                                                 [BetterTogether::Engine.root.join('spec/mailers/previews')]
+        app.config.action_mailer.preview_paths =
+          app.config.action_mailer.preview_paths.to_a +
+          [BetterTogether::Engine.root.join('spec/mailers/previews')]
       else
         app.config.action_mailer.show_previews = false
       end
@@ -91,12 +93,15 @@ class Engine < ::Rails::Engine
     # Add engine manifest to precompile assets in production
     initializer 'better_together.assets' do |app|
       # Ensure we are not modifying frozen arrays
-      app.config.assets.precompile += %w[better_together_manifest.js]
-      app.config.assets.paths = [root.join('app', 'assets', 'images'),
-                                 root.join('app', 'javascript'),
-                                 root.join('vendor', 'javascript'),
-                                 root.join('vendor', 'stylesheets'),
-                                 root.join('vendor', 'javascripts')] + app.config.assets.paths.to_a
+      app.config.assets.precompile =
+        app.config.assets.precompile.to_a + %w[better_together_manifest.js]
+      app.config.assets.paths =
+        app.config.assets.paths.to_a +
+        [root.join('app', 'assets', 'images'),
+         root.join('app', 'javascript'),
+         root.join('vendor', 'javascript'),
+         root.join('vendor', 'stylesheets'),
+         root.join('vendor', 'javascripts')]
     end
 
     initializer 'better_together.i18n' do |app|
@@ -107,9 +112,11 @@ class Engine < ::Rails::Engine
 
     initializer 'better_together.importmap', before: 'importmap' do |app|
       # Ensure we are not modifying frozen arrays
-      app.config.importmap.paths = [Engine.root.join('config/importmap.rb')] + app.config.importmap.paths.to_a
-      app.config.importmap.cache_sweepers = [root.join('app/assets/javascripts'),
-                                             root.join('app/javascript')] + app.config.importmap.cache_sweepers.to_a
+      app.config.importmap.paths =
+        app.config.importmap.paths.to_a + [Engine.root.join('config/importmap.rb')]
+      app.config.importmap.cache_sweepers =
+        app.config.importmap.cache_sweepers.to_a +
+        [root.join('app/assets/javascripts'), root.join('app/javascript')]
     end
 
     initializer 'better_together.importmap.pins', after: 'importmap' do |app|
diff --git a/spec/dummy/config/secrets.yml b/spec/dummy/config/secrets.yml
