Skip to content

chore: merge branch main into development - #3628

Merged
aaronskiba merged 21 commits into
developmentfrom
development-copy
Nov 15, 2026
Merged

aaronskiba merged 21 commits into
developmentfrom
development-copy

Conversation

@aaronskiba

Copy link
Copy Markdown
Contributor

Fixes # .

Changes proposed in this PR:

briri and others added 19 commits July 31, 2026 09:49
Disables a rubocop offence to fix a failing GitHub Actions workflow.
Fixes issue with API token auth
Harden Pundit policies for contributor and research output endpoints to enforce the expected access controls.
Reference: CDLUC3#803
- NOTE: The referenced PR also fixes app/controllers/paginable/research_outputs_controller.rb. However, that file does not exist within this codebase.

Co-Authored-By: Juliet Shin <8452761+jupiter007@users.noreply.github.com>
Add specs for the contributors index and new endpoints to ensure unauthorized plans are denied access.
fix(policy): harden authorization for plan resources
* Upgrade Roadmap to Ruby 3.4 and Rails 8.1

* Address Rails 8 upgrade review findings

* Document Rails 8 release and refresh schema annotations

* Use pinned Chrome binary for feature specs in CI

* Update GitHub Actions to Node 24 runtimes

---------

Co-authored-by: Alasdair Macleod <alasdair.j.macleod@ed.ac.uk>
Update user administration checks and record validation, with regression coverage and compatibility fixes. Detailed advisories will be published after release.
Add request coverage for super admins changing a user's organization and department in the same update. This exposes a validation-order issue where the department is checked against the user's current organization.
Super-admin user updates saved the permitted attributes first, then applied the selected organization in a separate `@user.update(org_id: ...)` call.

With department membership now validated against the user's organization, a request that changed the organization and department together was rejected: the department was checked against the user's current organization, and the organization change was never applied.

Assign `org_id` from the organization lookup before updating, so a single `@user.update` validates the organization and department together. The follow-up update call is removed.

Reload `@departments` after the update. It was previously built before the update, so after an organization change the re-rendered form listed the previous organization's departments. After a failed update, `@user.org` holds the unsaved organization, so the dropdown now matches the form's selected organization.
Add a TODO to verify whether the new-organization save block is still needed.

When org creation is allowed, org_from_params saves new organizations and identifiers before returning. When org creation is restricted, it returns an existing organization or nil. In either case, the controller's new-record fallback appears unreachable.
Refresh department options after successful and failed edits, preserve stored attributes on validation errors, and return HTTP 422 for invalid updates. Remove duplicate organization persistence now that selection-service coverage verifies organization and identifier creation.
fix(super_admin): update user org and department in a single save
Prepare v6.0.1 maintenance release
Merging merge conflicts as-is for auditing purposes. Will resolve merge conflicts in next commit.
@github-actions

Copy link
Copy Markdown
1 Warning
⚠️ This PR is too big! Consider breaking it down into smaller PRs.

Generated by 🚫 Danger

@aaronskiba
aaronskiba force-pushed the development-copy branch 3 times, most recently from ea3ee3a to 9a08d56 Compare November 14, 2026 06:55
For auditing purposes, commit 20df70e was merged without resolving its merge conflicts. This commit resolves those conflicts.

File resolutions:

CHANGELOG.md
- Accept both changes

db/schema.rb
- Use `ActiveRecord::Schema[8.1].define(version: 2026_02_19_185224) do`
  - This uses new Rails version as well as timestamp of latest migration
- Accept current changes to retain Doorkeeper tables

Gemfile.lock
- Accept incoming changes and run `bundle install`

All other files
- Accept incoming changes
@aaronskiba
aaronskiba merged commit f1c0325 into development Nov 15, 2026
9 of 10 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.

6 participants