Merge branch 'main' into f3wlvl-codex/prepare-app-for-rails-7.2-and-8-upgrade

Signed-off-by: Robert Smith <[email protected]>

Author: rsmithlal

.github/workflows/rubyonrails.yml

@@ -24,6 +24,7 @@ jobs:
       DATABASE_URL: "postgis://rails:password@localhost:5432/rails_test"
       ES_HOST: "http://localhost"
       RAILS_VERSION: ${{ matrix.rails }}
+    environment: test
     services:
       postgres:
         image: postgis/postgis:latest
@@ -64,6 +65,8 @@ jobs:
         run: rm -f spec/dummy/tmp/pids/server.pid && cd ./spec/dummy && bundle exec rails db:schema:load
       # Add or replace test runners here
       - name: Run tests
+        env:
+          RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
         run: rm -f spec/dummy/tmp/pids/server.pid && bundle exec rspec
 
   rubocop:

Gemfile.lock

@@ -167,19 +167,20 @@ GEM
       unf
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1133.0)
-    aws-sdk-core (3.227.0)
+    aws-partitions (1.1139.0)
+    aws-sdk-core (3.228.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.107.0)
-      aws-sdk-core (~> 3, >= 3.227.0)
+    aws-sdk-kms (1.109.0)
+      aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.194.0)
-      aws-sdk-core (~> 3, >= 3.227.0)
+    aws-sdk-s3 (1.195.0)
+      aws-sdk-core (~> 3, >= 3.228.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -246,9 +247,9 @@ GEM
       tilt
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.2.1)
+    database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
+      database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
     debug_inspector (1.2.0)
@@ -321,6 +322,8 @@ GEM
       multipart-post (~> 2.0)
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-arm64-darwin)
     ffi (1.17.2-x86_64-linux-gnu)
     fog-aws (3.32.0)
       base64 (~> 0.2.0)
@@ -354,6 +357,12 @@ GEM
       csv (>= 3.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
+    google-protobuf (4.30.2-aarch64-linux)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.30.2-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
     google-protobuf (4.30.2-x86_64-linux)
       bigdecimal
       rake (>= 13)
@@ -388,7 +397,7 @@ GEM
     image_processing (1.14.0)
       mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
-    importmap-rails (2.2.0)
+    importmap-rails (2.2.2)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
@@ -473,6 +482,10 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
+    nokogiri (1.18.9-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.9-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     noticed (2.8.0)
@@ -483,7 +496,9 @@ GEM
     parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    pg (1.6.0-x86_64-linux)
+    pg (1.6.1-aarch64-linux)
+    pg (1.6.1-arm64-darwin)
+    pg (1.6.1-x86_64-linux)
     popper_js (2.11.8)
     pp (0.6.2)
       prettyprint
@@ -509,18 +524,18 @@ GEM
       i18n (>= 0.5.0)
       railties (>= 6.1.0)
     public_suffix (6.0.1)
-    puma (6.6.0)
+    puma (6.6.1)
       nio4r (~> 2.0)
     pundit (2.5.0)
       activesupport (>= 3.0.0)
     racc (1.8.1)
-    rack (3.1.16)
+    rack (3.2.0)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (3.0.0)
       logger
       rack (>= 3.0.14)
-    rack-mini-profiler (4.0.0)
+    rack-mini-profiler (4.0.1)
       rack (>= 1.2.0)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
@@ -685,6 +700,10 @@ GEM
       ffi (~> 1.12)
       logger
     rubyzip (2.4.1)
+    sass-embedded (1.86.3-aarch64-linux-gnu)
+      google-protobuf (~> 4.30)
+    sass-embedded (1.86.3-arm64-darwin)
+      google-protobuf (~> 4.30)
     sass-embedded (1.86.3-x86_64-linux-gnu)
       google-protobuf (~> 4.30)
     sassc (2.4.0)
@@ -792,6 +811,8 @@ GEM
     zeitwerk (2.7.3)
 
 PLATFORMS
+  aarch64-linux
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES

app/assets/config/better_together_manifest.js

@@ -4,6 +4,7 @@
 //= link_tree ../stylesheets .css
 //= link_tree ../../../vendor/stylesheets .css
 //= link_tree ../stylesheets .scss
+//= link better_together/mailer.css
 //= link_tree ../images
 
 //= link actioncable.js

app/assets/stylesheets/better_together/application.scss

@@ -14,29 +14,29 @@
  *= require_self
  */
 
-@import 'theme';
+@use 'theme' as *;
 
 // Import Bootstrap and Font Awesome
 
-@import 'bootstrap';
-@import 'cards';
-@import 'devise';
-@import 'font-awesome';
-@import 'actiontext';
-@import 'contact_details';
-@import 'content_blocks';
-@import 'conversations';
-@import 'forms';
-@import 'image-galleries';
-@import 'maps';
-@import 'metrics';
-@import 'navigation';
-@import 'notifications';
-@import 'profiles';
-@import 'simple_calendar';
-@import 'share';
-@import 'sidebar_nav';
-@import 'trix-extensions/richtext';
+@use 'bootstrap' as *;
+@use 'cards';
+@use 'devise';
+@use 'font-awesome';
+@use 'actiontext';
+@use 'contact_details';
+@use 'content_blocks';
+@use 'conversations';
+@use 'forms';
+@use 'image-galleries';
+@use 'maps';
+@use 'metrics';
+@use 'navigation';
+@use 'notifications';
+@use 'profiles';
+@use 'simple_calendar';
+@use 'share';
+@use 'sidebar_nav';
+@use 'trix-extensions/richtext';
 
 // Styles that use the variables
 .text-opposite-theme {
@@ -74,7 +74,7 @@
 #flash_messages {
   position: absolute;
   width: 100vw;
-  top: 7.5vh;
+  top: 6vh;
   z-index: 1001;
 }
 

app/assets/stylesheets/better_together/contact_details.scss

@@ -1,4 +1,4 @@
-@import 'theme';
+@use 'theme' as *;
 
 .contact-detail-item {
   margin-bottom: 15px;

app/assets/stylesheets/better_together/forms.scss

@@ -1,4 +1,4 @@
-@import "theme";
+@use "theme" as *;
 
 .required-indicator {
   color: $danger;

app/assets/stylesheets/better_together/share.scss

@@ -1,5 +1,4 @@
-
-@import 'theme';
+@use 'theme' as *;
 
 .social-share-buttons {
   margin-top: 40px;

app/assets/stylesheets/better_together/sidebar_nav.scss

@@ -1,4 +1,4 @@
-@import 'theme';
+@use 'theme' as *;
 
 #sidebar_nav {
   // Sidebar heading styles

app/controllers/better_together/application_controller.rb

@@ -242,5 +242,17 @@ def after_sign_out_path_for(_resource_or_scope)
     def platform_invitation_expiry_time
       30.minutes
     end
+
+    helper_method :metric_viewable_type, :metric_viewable_id
+
+    attr_accessor :metric_viewable
+
+    def metric_viewable_type
+      metric_viewable&.class&.name
+    end
+
+    def metric_viewable_id
+      metric_viewable&.id
+    end
   end
 end

app/controllers/better_together/communities_controller.rb

@@ -13,10 +13,7 @@ def index
     end
 
     # GET /communities/1
-    def show
-      # Dispatch the background job for tracking the page view
-      BetterTogether::Metrics::TrackPageViewJob.perform_later(@resource, I18n.locale.to_s) unless bot_request?
-    end
+    def show; end
 
     # GET /communities/new
     def new