From a57f3bab08c6a4328713d13c1370f9728676adb7 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 2 Dec 2021 13:46:29 -0800
Subject: [PATCH] Update gitea to 1.15.7

Changelog here:
  https://github.com/go-gitea/gitea/blob/v1.15.7/CHANGELOG.md#1157---2021-12-01

Seems to mostly be a number of bugfixes which we like to get.

Note there is one tiny mostly inconsequently template update that we
make to a commented out portion of the head navbar file. But we do this
to avoid unnecessary future delta that needs to be resolved.

Change-Id: I9bf19c4f63d1713701ec889a705f3c8855d943d7
---
 docker/gitea/Dockerfile                             | 2 +-
 docker/gitea/custom/templates/base/head_navbar.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile
index 4a6129e80f..3784bc9885 100644
--- a/docker/gitea/Dockerfile
+++ b/docker/gitea/Dockerfile
@@ -27,7 +27,7 @@ FROM docker.io/library/golang:1.16-bullseye AS build-env
 
 LABEL maintainer="infra-root@openstack.org"
 
-ARG GITEA_VERSION="v1.15.6"
+ARG GITEA_VERSION="v1.15.7"
 ENV TAGS "bindata $TAGS"
 
 #Build deps
diff --git a/docker/gitea/custom/templates/base/head_navbar.tmpl b/docker/gitea/custom/templates/base/head_navbar.tmpl
index 1e96c6c5f4..92dc52a48d 100644
--- a/docker/gitea/custom/templates/base/head_navbar.tmpl
+++ b/docker/gitea/custom/templates/base/head_navbar.tmpl
@@ -197,7 +197,7 @@
 					{{svg "octicon-person"}} {{.i18n.Tr "register"}}
 				</a>
 			{{end}}
-			<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{.CurrentURL}}">
+			<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login{{if not .PageIsSignIn}}?redirect_to={{.CurrentURL}}{{end}}">
 				{{svg "octicon-sign-in"}} {{.i18n.Tr "sign_in"}}
 			</a>
 			-->