Skip to content

staging into main#173

Merged
rsmoke merged 8 commits intomainfrom
staging
Jan 13, 2026
Merged

staging into main#173
rsmoke merged 8 commits intomainfrom
staging

Conversation

@rsmoke
Copy link
Member

@rsmoke rsmoke commented Jan 13, 2026

No description provided.

dependabot bot and others added 8 commits December 30, 2025 21:12
Bumps the bundler group with 1 update in the / directory: [uri](https://github.com/ruby/uri).


Updates `uri` from 0.13.2 to 0.13.3
- [Release notes](https://github.com/ruby/uri/releases)
- [Commits](ruby/uri@v0.13.2...v0.13.3)

---
updated-dependencies:
- dependency-name: uri
  dependency-version: 0.13.3
  dependency-type: indirect
  dependency-group: bundler
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps the npm_and_yarn group with 1 update in the / directory: [trix](https://github.com/basecamp/trix).


Updates `trix` from 2.1.15 to 2.1.16
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](basecamp/trix@v2.1.15...v2.1.16)

---
updated-dependencies:
- dependency-name: trix
  dependency-version: 2.1.16
  dependency-type: direct:production
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
- Updated JudgingRoundsController to handle selected judge assignments, allowing users to send instructions to specific judges or all judges if none are selected.
- Added `instructions_sent_at` column to RoundJudgeAssignments model to track when instructions are sent.
- Improved the manage judges view with a modal for selecting judges to receive instructions, including visual feedback for sent instructions.
- Implemented error handling for cases where no judges are selected, redirecting with an alert message.
- Enabled mailer previews in production and staging with authorization for enhanced testing capabilities.
…lection administrators

- Updated JudgingRoundsController to include collection administrator emails when sending judging instructions, based on user selection.
- Enhanced the manage judges view to add a checkbox for sending copies to collection administrators, displaying their emails dynamically.
- Modified JudgingInstructionsMailer to accept CC emails for collection administrators, ensuring they receive relevant instructions.

This improves communication with administrators and streamlines the judging process.
…roller

- Added comprehensive tests for the `send_instructions` action in JudgingRoundsController, covering scenarios for sending to all judges, selected judges, and handling CC emails for collection administrators.
- Implemented error handling tests for cases where no judges are assigned or selected, ensuring appropriate flash messages and redirects.
- Updated JudgingInstructionsMailer tests to verify inclusion of CC recipients and proper email properties when CC emails are provided or omitted.

This improves the robustness of the judging instructions feature and ensures reliable email delivery.
…erage

- Updated variable names for clarity, specifically changing `assignment` to `@admin_assignment` for better context.
- Enhanced test cases for the `send_instructions` action, including scenarios for empty rounds and invalid judge IDs.
- Improved assertions to check for correct timestamps when instructions are sent, ensuring accurate time tracking.
- Added tests for CC functionality, verifying that collection administrators receive emails as expected.

These changes enhance the readability and reliability of the test suite for the JudgingRoundsController.
…6c920

Bump uri from 0.13.2 to 0.13.3 in the bundler group across 1 directory
…yarn-bb5408b087

Bump trix from 2.1.15 to 2.1.16 in the npm_and_yarn group across 1 directory
@rsmoke rsmoke merged commit 1a6b3f2 into main Jan 13, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant