chore: resolve additional merge conflicts with upstream/master

Author: mroderick

.github/workflows/ruby.yml

@@ -17,6 +17,7 @@ jobs:
       BUNDLE_IGNORE_FUNDING_REQUESTS: true
       BUNDLE_IGNORE_MESSAGES: true
       RAILS_ENV: test
+      COVERAGE: true
       PARALLEL_TEST_PROCESSORS: ${{ matrix.ci_node_total }}
     services:
       postgres:

.rubocop.yml

@@ -9,6 +9,10 @@ AllCops:
     - bin/**/*
     - vendor/bundle/**/*
 
+Lint/Syntax:
+  Exclude:
+    - app/views/**/*.haml
+
 plugins:
   - rubocop-capybara
   - rubocop-performance

AGENTS.md

@@ -31,7 +31,8 @@ codebar planner is a Rails 8.1 application for managing [codebar.io](https://cod
 
 - **Setup**: `bundle && rake db:create db:migrate db:seed`
 - **Server**: `bundle exec rails server`
-- **Tests**: `bundle exec rspec [path]` - runs RSpec tests, optionally for specific file/line
+- **Tests**: `make test` or `bundle exec parallel_rspec spec/ -n 3` - runs RSpec tests in parallel (3 processes is optimal)
+- **Single test**: `bundle exec rspec spec/path/to/file_spec.rb:42`
 - **Rails console**: `bundle exec rails console`
 - **Run rake tasks**: `bundle exec rake [task]`
 - **Linting**: `bundle exec rubocop`
@@ -129,14 +130,15 @@ See `app/models/README.md` for detailed data model documentation.
 - **JavaScript Driver**: Playwright (Chromium by default)
 - **Factories**: Fabrication (not FactoryBot)
 - **Test data**: Faker for generated data
-- **Coverage**: SimpleCov
+- **Coverage**: SimpleCov (runs in CI when COVERAGE=true)
+- **Parallel testing**: Use `make test` or `bundle exec parallel_rspec spec/ -n 3` for ~45% faster test runs
 - **JavaScript tests**: Capybara with Playwright driver
   - Use `PLAYWRIGHT_HEADLESS=false` to debug with visible browser
   - Use `PWDEBUG=1` for Playwright Inspector (step-through debugging)
   - Use `PLAYWRIGHT_BROWSER=firefox` or `webkit` for cross-browser testing
 - **Matchers**: Shoulda Matchers, RSpec Collection Matchers
 
-Run single test: `bin/drspec spec/path/to/file_spec.rb:42`
+Run single test: `bundle exec rspec spec/path/to/file_spec.rb:42`
 
 ## Code Style
 

Gemfile

@@ -18,6 +18,7 @@ gem 'csv' # LOCKED: csv was loaded from the standard library, but is not part of
 gem 'delayed_job'
 gem 'delayed_job_active_record'
 gem 'drb' # LOCKED: Added because of pry-remote
+gem 'email_validator'
 gem 'font_awesome5_rails'
 gem 'bootstrap', '~> 5'
 gem 'friendly_id'
@@ -61,7 +62,7 @@ gem 'stripe'
 gem 'rails-html-sanitizer', '~> 1.7.0'
 
 # Use the Puma web server [https://github.com/puma/puma]
-gem 'puma', '~> 7.2'
+gem 'puma', '~> 8.0'
 # Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
 gem 'importmap-rails'
 # Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
@@ -114,7 +115,6 @@ group :test do
   gem 'shoulda-matchers', '~> 7.0'
   gem 'simplecov',      require: false
   gem 'simplecov-lcov', require: false
-  gem 'timecop', '~> 0.9.10'
   gem 'webmock'
 end
 
@@ -126,4 +126,4 @@ gem 'rollbar'
 gem 'scout_apm'
 
 gem 'carrierwave-aws', '~> 1.6'
-gem 'sitemap_generator', github: 'kjvarga/sitemap_generator', branch: 'master' # LOCKED: When a version higher than 6.3.0 is released, drop this LOCKED.
+gem 'sitemap_generator', '~> 7.0'

Gemfile.lock

@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/kjvarga/sitemap_generator.git
-  revision: 747988328566c84b0b8aa1ab898ababc371284dc
-  branch: master
-  specs:
-    sitemap_generator (6.4.0)
-      builder (~> 3.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -115,14 +107,14 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (4.1.1)
+    bigdecimal (4.1.2)
     bindex (0.8.1)
     binding_of_caller (2.0.0)
       debug_inspector (>= 1.2.0)
     bootstrap (5.3.8)
       popper_js (>= 2.11.8, < 3)
     builder (3.3.0)
-    bullet (8.1.0)
+    bullet (8.1.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (13.0.0)
@@ -158,10 +150,10 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    commonmarker (2.7.0-aarch64-linux)
-    commonmarker (2.7.0-arm64-darwin)
-    commonmarker (2.7.0-x86_64-darwin)
-    commonmarker (2.7.0-x86_64-linux)
+    commonmarker (2.8.1-aarch64-linux)
+    commonmarker (2.8.1-arm64-darwin)
+    commonmarker (2.8.1-x86_64-darwin)
+    commonmarker (2.8.1-x86_64-linux)
     concurrent-ruby (1.3.6)
     connection_pool (3.0.2)
     crack (1.0.1)
@@ -193,11 +185,13 @@ GEM
       dotenv (= 3.2.0)
       railties (>= 6.1)
     drb (2.2.3)
-    erb (6.0.2)
+    email_validator (2.2.4)
+      activemodel
+    erb (6.0.4)
     erubi (1.13.1)
     execjs (2.10.1)
     fabrication (2.31.0)
-    faker (3.6.1)
+    faker (3.8.0)
       i18n (>= 1.8.11, < 2)
     faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
@@ -248,7 +242,7 @@ GEM
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.8.2)
-    irb (1.17.0)
+    irb (1.18.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
@@ -258,7 +252,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.19.3)
+    json (2.19.5)
     jwt (2.7.1)
     language_server-protocol (3.17.0.5)
     launchy (3.1.1)
@@ -292,14 +286,14 @@ GEM
     mini_magick (5.3.1)
       logger
     mini_mime (1.1.5)
-    minitest (6.0.3)
+    minitest (6.0.5)
       drb (~> 2.0)
       prism (~> 1.5)
     multi_xml (0.6.0)
     mutex_m (0.3.0)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.2)
+    net-imap (0.6.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -309,13 +303,13 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.5)
-    nokogiri (1.19.2-aarch64-linux-gnu)
+    nokogiri (1.19.3-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.2-arm64-darwin)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-darwin)
+    nokogiri (1.19.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-gnu)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -339,11 +333,11 @@ GEM
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     ostruct (0.6.3)
-    pagy (43.5.0)
+    pagy (43.5.3)
       json
       uri
       yaml
-    parallel (2.0.1)
+    parallel (2.1.0)
     parallel_tests (5.7.0)
       parallel
     parser (3.3.11.1)
@@ -393,7 +387,7 @@ GEM
       i18n (>= 0.5.0)
       railties (>= 6.1)
     public_suffix (7.0.5)
-    puma (7.2.0)
+    puma (8.0.1)
       nio4r (~> 2.0)
     pundit (2.5.2)
       activesupport (>= 3.0.0)
@@ -495,9 +489,9 @@ GEM
     rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-capybara (2.22.1)
+    rubocop-capybara (2.23.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (~> 1.81)
     rubocop-performance (1.26.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
@@ -527,7 +521,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (6.1.1)
+    scout_apm (6.2.0)
       parser
     securerandom (0.4.1)
     semantic_logger (4.18.0)
@@ -544,6 +538,8 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.9.0)
     simplecov_json_formatter (0.1.4)
+    sitemap_generator (7.0.1)
+      builder (~> 3.0)
     slop (3.6.0)
     snaky_hash (2.0.1)
       hashie
@@ -567,15 +563,14 @@ GEM
       execjs (>= 0.3.0, < 3)
     thor (1.5.0)
     tilt (2.7.0)
-    timecop (0.9.10)
-    timeout (0.6.0)
+    timeout (0.6.1)
     tsort (0.2.0)
     turbo-rails (2.0.23)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2026.1)
+    tzinfo-data (1.2026.2)
       tzinfo (>= 1.0.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
@@ -584,7 +579,7 @@ GEM
     uri (1.1.1)
     useragent (0.16.11)
     version_gem (1.1.3)
-    view_component (4.6.0)
+    view_component (4.8.0)
       actionview (>= 7.1.0)
       activesupport (>= 7.1.0)
       concurrent-ruby (~> 1)
@@ -635,6 +630,7 @@ DEPENDENCIES
   delayed_job_active_record
   dotenv-rails
   drb
+  email_validator
   fabrication
   faker
   faraday
@@ -666,7 +662,7 @@ DEPENDENCIES
   pry-rails
   pry-remote
   public_activity
-  puma (~> 7.2)
+  puma (~> 8.0)
   pundit
   rack-mini-profiler (~> 4.0)
   rails (~> 8.1.2)
@@ -689,12 +685,11 @@ DEPENDENCIES
   simple_form
   simplecov
   simplecov-lcov
-  sitemap_generator!
+  sitemap_generator (~> 7.0)
   sprockets-rails
   stimulus-rails
   stripe
   terser
-  timecop (~> 0.9.10)
   turbo-rails
   tzinfo-data
   view_component

Makefile

@@ -22,3 +22,6 @@ deploy_staging:
 	heroku maintenance:off --app=codebar-staging
 serve:
 	rm -f ./tmp/pids/server.pid && bundle exec rails server --binding=0.0.0.0 --port=3000
+
+test:
+	bundle exec parallel_rspec spec/ -n 3

Procfile

@@ -1,2 +1,2 @@
 release: bundle exec rake db:migrate
-web: bundle exec puma -C config/puma.rb
+web: bin/start-nginx bundle exec puma -C config/puma.rb

app/assets/javascripts/application.js

@@ -99,13 +99,43 @@ $(function() {
     });
   }
 
+  // TomSelect for meeting organisers (multi-select)
+  if ($('#meeting_organisers').length) {
+    new TomSelect('#meeting_organisers', {
+      plugins: ['remove_button'],
+      placeholder: 'Type to search members...',
+      valueField: 'id',
+      labelField: 'full_name',
+      searchField: ['full_name', 'email'],
+      create: false,
+      loadThrottle: 300,
+      shouldLoad: function(query) {
+        return query.length >= 3;
+      },
+      load: function(query, callback) {
+        fetch('/admin/members/search?q=' + encodeURIComponent(query))
+          .then(response => response.json())
+          .then(json => callback(json))
+          .catch(() => callback());
+      },
+      render: {
+        option: function(item, escape) {
+          return '<div>' + escape(item.full_name) + ' <small class="text-muted">' + escape(item.email) + '</small></div>';
+        },
+        no_results: function(data, escape) {
+          return '<div class="no-results">No members found</div>';
+        }
+      }
+    });
+  }
+
   // Chosen for all other selects (exclude TomSelect fields)
   // Chosen hides inputs and selects, which becomes problematic when they are
   // required: browser validation doesn't get shown to the user.
   // This fix places "the original input behind the Chosen input, matching the
   // height and width so that the warning appears in the correct position."
   // https://github.com/harvesthq/chosen/issues/515#issuecomment-474588057
-  $('select').not('#member_lookup_id, #meeting_invitations_member').on('chosen:ready', function () {
+  $('select').not('#member_lookup_id, #meeting_invitations_member, #meeting_organisers').on('chosen:ready', function () {
     var height = $(this).next('.chosen-container').height();
     var width = $(this).next('.chosen-container').width();
 
@@ -117,7 +147,7 @@ $(function() {
     }).show();
   });
 
-  $('select').not('#member_lookup_id, #meeting_invitations_member').chosen({
+  $('select').not('#member_lookup_id, #meeting_invitations_member, #meeting_organisers').chosen({
     allow_single_deselect: true,
     no_results_text: 'No results matched'
   });

app/controllers/admin/events_controller.rb

@@ -67,7 +67,7 @@ def attendees_emails
   private
 
   def set_event
-    @original_event = Event.find_by(slug: params[:id])
+    @original_event = Event.find_by!(slug: params[:id])
     @event = EventPresenter.new(@original_event)
   end
 

app/controllers/admin/groups_controller.rb

@@ -22,11 +22,15 @@ def create
   def show
     @group = Group.find(params[:id])
     authorize @group
+
+    @eligible_count = @group.eligible_members.count
+    @total_count = @group.members.count
+    @pagy, @members = pagy(Group.members_by_recent_rsvp(@group), items: 20)
   end
 
   private
 
   def group_params
-    params.expect(group: [:name, :description, :chapter_id])
+    params.expect(group: %i[name description chapter_id])
   end
 end