Conversation
This was referenced Sep 27, 2026
Brings the T2 2026 calendar work from ontrack-features-t2-2026 11.0.x (reviewed and merged work) onto thoth-tech 11.0.x. Co-authored-by: maplefoxgit <s223932052@deakin.edu.au> Co-authored-by: Maple Fox <s223932052@deakin.edu.au> Co-authored-by: dylancleal <dylancleal@gmail.com> Co-authored-by: blankb0t <benee0394@gmail.com>
Clupai8o0
force-pushed
the
upstream-pr/calendar
branch
from
September 27, 2026 09:59
6eb05db to
c745546
Compare
This was referenced Sep 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this is
Extends the existing WebCal feed. A student can opt in to having their unit sessions, such as HelpHubs and classes with join links, in the same calendar as their task dates.
What is in it
app/models/webcal.rbadds published learning sessions for enrolled, active units wheninclude_learning_sessionsis on. It usesUnitLearningSessionfrom the Unit Hub PR.webcal_api.rbandwebcal_entity.rbaccept and return the newinclude_learning_sessionsoption.1DtoPT4H.webcal_public_api.rbsendsCache-Control: private, no-storeon the public feed.test/api/webcal_api_test.rband the calendar model tests.How this set of PRs works
This is one of 24 PRs from the Thoth Tech T2 2026 Features team (9 api, 14 web, 1 deploy), one per feature per repo. Each one carries that feature's files, taken from our team org's
11.0.xbranch, and applied straight onto thoth-tech11.0.x. Every file is in exactly one PR. Some files are shared between features, so a PR on its own may not build. The demo PR in each repo (api #127, web doubtfire-lms#544) is imported by earlier PRs too, so it has to go in with the rest, not be dropped. Merged in the order below, the set equals our org11.0.xminus team docs, evidence files, org-only CI and dev setup files. No app code or tests are left out.On 28 Sep 2026 the set was brought up to our org's latest merges (api ontrack-features-t2-2026#178, web ontrack-features-t2-2026/doubtfire-web#281 and ontrack-features-t2-2026/doubtfire-web#282, deploy ontrack-features-t2-2026/doubtfire-deploy#41). Most PRs got one more commit for that. Two web PRs are new, panels (thoth-tech/doubtfire-web#546) and celebrate (thoth-tech/doubtfire-web#547), for files that were in no PR before.
Merge order, api first, then web, then deploy. In web, panels goes before the pages that use it, and celebrate goes after a11y, whose confetti service it needs.
Built against
11.0.x@dc76a5a0e, taken from org11.0.x@a9589b30211.0.x@20d1f380c, taken from org11.0.x@0b8a2034411.0.x@58905969e, taken from org11.0.x@8e560f7e0Testing
Checked on 28 Sep 2026 with all the branches merged together. This PR was not tested on its own, see above.
11.0.x,npm run test:ciruns 2603 tests in 290 files, all passing, andnpm run lintandng buildpass. The merged set's app code is the same as our org11.0.xafter fix(profile): save a changed summary email cadence ontrack-features-t2-2026/doubtfire-web#282, where CI passedtest,lint (22)andbuild (22).11.0.x. 1799 tests, 20182 assertions, 0 failures, 0 errors, 0 skips. It ran through our CI on branchcheck/upstream-combined-28sep(run), and the database schema check and RuboCop pass there too. The set differs from our org11.0.xonly by the left-out docs, evidence, CI and dev setup files, none of them app code.production/tests/validate_test.sh,verify_pwa_test.py,publish_release_test.pyandnginx_upload_test.pypass. The production compose file loads withdocker compose configagainst.env.production.example, and the development and.devcontainerones load as they are.Contributors
Samridh Limbu, Maple Fox, dylancleal, blankb0t