Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
python-version-file: ".python-version"
enable-cache: true

- uses: actions/setup-node@v4
- uses: actions/setup-node@v7
with:
node-version: 24
cache: npm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/combine-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@v9
id: create-combined-pr
name: Create Combined PR
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# apt packages, Python dependencies and node modules are all cached separately.

# ---- Frontend assets (multi-arch: official node image) ----
FROM node:24-slim AS assets
FROM node:26-slim AS assets
WORKDIR /app

COPY package.json package-lock.json ./
Expand Down
3 changes: 2 additions & 1 deletion assets/templates/cable_type_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
<div class="col mt-2 text-end">
{% button 'edit' url='cable_type_update' pk=object.id %}
</div>
{% cache None cable_type_assets object %}
{# cached indefinitely: bump the "bs5" suffix whenever this markup changes #}
{% cache None cable_type_assets_bs5 object %}
<div class="col mt-2">
<div class="card">
<div class="card-header">Associated Assets</div>
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ dependencies = [
"premailer~=3.10",
"psycopg2-binary~=2.9",
"pypdf~=6.19",
"pytz~=2025.2",
"reportlab~=4.4",
"simplejson~=3.20",
"pytz>=2025.2,<2027.0",
"reportlab>=4.4,<6.0",
"simplejson>=3.20,<5.0",
"whitenoise~=6.12",
"sentry-sdk~=2.68",
"diff-match-patch>=20241021,<20300000",
Expand Down
904 changes: 454 additions & 450 deletions uv.lock

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion versioning/templates/activity_feed_data.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
{% load cache %}

{% block content %}
{% cache None feed_data request.user %}
{# The fragment is cached indefinitely (in the database in production), so bump the "bs5" suffix whenever its markup changes #}
{% cache None feed_data_bs5 request.user %}
<div class="list-group-item">
<div class="d-flex">
{% for version in object_list %}
Expand Down
Loading