From 433721289c4528d9d2f8463c4516f2624fcad633 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 30 Apr 2025 10:06:06 -0700 Subject: [PATCH] Update to Gitea 1.24.2 Gitea 1.24.0, 1.24.1, and 1.24.2 have been released. There are a large number of changes noted in the change changelog [0]. It is probably worth skimming over that to ensure there aren't any major impacts to how we run Gitea. I have also included the breaking change list below with my notes on how they affect us (if at all). * BREAKING * Make Gitea always use its internal config, ignore /etc/gitconfig (https://github.com/go-gitea/gitea/pull/33076) * `git grep gitconfig` within system-config produces no results. I don't think we were ever using a system level gitconfig with gitea. * Improve log format (https://github.com/go-gitea/gitea/pull/33814) * The primary concern here is that log parsers would need updating. We don't parse any gitea logs currently. * Fix markdown render behaviors (https://github.com/go-gitea/gitea/pull/34122) * This appears to be an update to change gitea's rendering of markdown files within repos to better match githubs. Considering that many of our repos mirror to gitea and github this is probably a positive change overall. Worst case some repos may need to update markdown formatting to match the latest rendering rules. * Add package version api endpoints (https://github.com/go-gitea/gitea/pull/34173) * We don't use Gitea's package repo system. The change in api fields here shouldn't affect us. [0] https://github.com/go-gitea/gitea/blob/v1.24.2/CHANGELOG.md Change-Id: Ia99f442ff62a7bf71b04dcc274b1ce95670a5b7d --- docker/gitea/Dockerfile | 4 +- .../custom/templates/base/head_navbar.tmpl | 52 +++++++++++-------- .../gitea/custom/templates/repo/header.tmpl | 17 +++--- 3 files changed, 41 insertions(+), 32 deletions(-) diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile index 0ce4585498..32eea18a50 100644 --- a/docker/gitea/Dockerfile +++ b/docker/gitea/Dockerfile @@ -25,14 +25,14 @@ ################################### # Build stage -FROM docker.io/library/golang:1.23-bookworm AS build-env +FROM docker.io/library/golang:1.24-bookworm AS build-env LABEL maintainer="infra-root@openstack.org" ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} -ARG GITEA_VERSION="v1.23.8" +ARG GITEA_VERSION="v1.24.2" ENV TAGS "bindata timetzdata $TAGS" # Build deps diff --git a/docker/gitea/custom/templates/base/head_navbar.tmpl b/docker/gitea/custom/templates/base/head_navbar.tmpl index 501a4bdd05..914efb33de 100644 --- a/docker/gitea/custom/templates/base/head_navbar.tmpl +++ b/docker/gitea/custom/templates/base/head_navbar.tmpl @@ -1,8 +1,11 @@ {{$notificationUnreadCount := 0}} {{if and .IsSigned .NotificationUnreadCount}} - {{$notificationUnreadCount = call .NotificationUnreadCount}} + {{$notificationUnreadCount = call .NotificationUnreadCount ctx}} +{{end}} +{{$activeStopwatch := NIL}} +{{if and .IsSigned EnableTimetracking .GetActiveStopwatch}} + {{$activeStopwatch = call .GetActiveStopwatch ctx}} {{end}} -