From 2343b9bd09cda3e474b36842fae419f9fe32b134 Mon Sep 17 00:00:00 2001
From: Caesar Schinas <caesar@caesarschinas.com>
Date: Sat, 17 Dec 2022 00:20:38 -1000
Subject: [PATCH 01/36] [BRANDING] add Forgejo logo

(cherry picked from commit f42622c7d5a28859f535e0d86ece06101baad1ef)
(cherry picked from commit a39e7f2a79f6527d45439f21bd88378264160c3a)
(cherry picked from commit afa2a31bb99c0fd9cd25c3c0279e6c49695b1900)
(cherry picked from commit 276e8856e594ad7e73414382d34fdf0278cbca6a)
(cherry picked from commit 68e3bd469f2e8190db70d4e1564fb46d01feb5f4)
(cherry picked from commit af124b9ccbb0b699ea5d1bf1530613cb9a96f205)
(cherry picked from commit b89ab4874d403c784c92e579f4f6a854621c0078)
(cherry picked from commit 0f2a2f0d0ff9851428d6899e307f3547d7651f87)
(cherry picked from commit 80999363c73e4e01cbf9116491743c87baa952af)
(cherry picked from commit f8880b5463aa1db047d89080d21e7a69979eb4a6)
(cherry picked from commit 5f4cf4f6e143237c81da3e80875727cef4b76343)
(cherry picked from commit b38e26bc1a8bb117f571672961a8445cfc02c953)
(cherry picked from commit d839e0033244b63df16c8b548cc52106fc693629)
(cherry picked from commit 32ffe2e4f12c16a44a759c906078d40731c1a0c7)
(cherry picked from commit f1fd0504add78ae3fb5c710ab5a9ada20321afac)
(cherry picked from commit 6d77ea4d60a193d9d4175c4943b34077228e5964)
(cherry picked from commit 61a0a4a276303c3fd56f93fd109e3416cfdf7c60)
(cherry picked from commit a90b4126fdd55feef43f45d1dc3e3400806a476b)
(cherry picked from commit 9a20538fb4e88682e213a20813b77cc0f602fbfd)
(cherry picked from commit ce0fc02f0fbaa45b146fed175ce68bd02c507f3e)
(cherry picked from commit 541f7cb026f976d078ecb6da3a6c9e13cc4336f2)
(cherry picked from commit d6d0c2ab78a14d7aac8d7b6b0d007149de2f7295)
(cherry picked from commit 2c28f5ad2496cf30eb15d6caf9171b79e5017141)
(cherry picked from commit 9571bddb3308e3c1f0383e60f972ca61a0a467b7)
(cherry picked from commit c83ba08d01f149ecd52d983eec76bd60822c1ddd)
(cherry picked from commit 30e7d567ede79c015d0d115d9a2d535e6c681cb9)
(cherry picked from commit a8b8c3eba75511449dc97fa27b37db1076ce95f0)
(cherry picked from commit 8e053e1ade4710ade3b6e4bc6aa04fe9281243d7)
(cherry picked from commit 9e3b0f7520a56e5eb22cd0e33e231ea9063f0e1f)
---
 README.md                              |   2 +-
 assets/favicon.svg                     |  56 ++++++++++++-------------
 assets/logo.svg                        |  56 ++++++++++++-------------
 public/assets/img/apple-touch-icon.png | Bin 3162 -> 2709 bytes
 public/assets/img/avatar_default.png   | Bin 4889 -> 3189 bytes
 public/assets/img/favicon.png          | Bin 4351 -> 2968 bytes
 public/assets/img/favicon.svg          |   2 +-
 public/assets/img/forgejo.svg          |   1 +
 public/assets/img/gitea-original.svg   |   1 +
 public/assets/img/gitea.svg            |   2 +-
 public/assets/img/logo.png             | Bin 14354 -> 6747 bytes
 public/assets/img/logo.svg             |   2 +-
 12 files changed, 58 insertions(+), 64 deletions(-)
 create mode 100644 public/assets/img/forgejo.svg
 create mode 100644 public/assets/img/gitea-original.svg

diff --git a/README.md b/README.md
index e223979d42..2c0a3ef3ea 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-    <img src="https://codeberg.org/forgejo/meta/raw/branch/readme/logo/forgejo.svg" alt="" width="192" align="center" />
+    <img src="./assets/logo.svg" alt="" width="192" align="center" />
     <h1 align="center">Welcome to Forgejo</h1>
 </div>
 
diff --git a/assets/favicon.svg b/assets/favicon.svg
index 9df6b83b56..bcacdc0200 100644
--- a/assets/favicon.svg
+++ b/assets/favicon.svg
@@ -1,31 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="main_outline" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 640 640" style="enable-background:new 0 0 640 640;" xml:space="preserve">
-<g>
-	<path id="teabag" style="fill:#FFFFFF" d="M395.9,484.2l-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5,21.2-17.9,33.8-11.8
-		c17.2,8.3,27.1,13,27.1,13l-0.1-109.2l16.7-0.1l0.1,117.1c0,0,57.4,24.2,83.1,40.1c3.7,2.3,10.2,6.8,12.9,14.4
-		c2.1,6.1,2,13.1-1,19.3l-61,126.9C423.6,484.9,408.4,490.3,395.9,484.2z"/>
-	<g>
-		<g>
-			<path style="fill:#609926" d="M622.7,149.8c-4.1-4.1-9.6-4-9.6-4s-117.2,6.6-177.9,8c-13.3,0.3-26.5,0.6-39.6,0.7c0,39.1,0,78.2,0,117.2
-				c-5.5-2.6-11.1-5.3-16.6-7.9c0-36.4-0.1-109.2-0.1-109.2c-29,0.4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5
-				c-9.8-0.6-22.5-2.1-39,1.5c-8.7,1.8-33.5,7.4-53.8,26.9C-4.9,212.4,6.6,276.2,8,285.8c1.7,11.7,6.9,44.2,31.7,72.5
-				c45.8,56.1,144.4,54.8,144.4,54.8s12.1,28.9,30.6,55.5c25,33.1,50.7,58.9,75.7,62c63,0,188.9-0.1,188.9-0.1s12,0.1,28.3-10.3
-				c14-8.5,26.5-23.4,26.5-23.4s12.9-13.8,30.9-45.3c5.5-9.7,10.1-19.1,14.1-28c0,0,55.2-117.1,55.2-231.1
-				C633.2,157.9,624.7,151.8,622.7,149.8z M125.6,353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6,321.8,60,295.4
-				c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5,38.5-30c13.8-3.7,31-3.1,31-3.1s7.1,59.4,15.7,94.2c7.2,29.2,24.8,77.7,24.8,77.7
-				S142.5,359.9,125.6,353.9z M425.9,461.5c0,0-6.1,14.5-19.6,15.4c-5.8,0.4-10.3-1.2-10.3-1.2s-0.3-0.1-5.3-2.1l-112.9-55
-				c0,0-10.9-5.7-12.8-15.6c-2.2-8.1,2.7-18.1,2.7-18.1L322,273c0,0,4.8-9.7,12.2-13c0.6-0.3,2.3-1,4.5-1.5c8.1-2.1,18,2.8,18,2.8
-				l110.7,53.7c0,0,12.6,5.7,15.3,16.2c1.9,7.4-0.5,14-1.8,17.2C474.6,363.8,425.9,461.5,425.9,461.5z"/>
-			<path style="fill:#609926" d="M326.8,380.1c-8.2,0.1-15.4,5.8-17.3,13.8c-1.9,8,2,16.3,9.1,20c7.7,4,17.5,1.8,22.7-5.4
-				c5.1-7.1,4.3-16.9-1.8-23.1l24-49.1c1.5,0.1,3.7,0.2,6.2-0.5c4.1-0.9,7.1-3.6,7.1-3.6c4.2,1.8,8.6,3.8,13.2,6.1
-				c4.8,2.4,9.3,4.9,13.4,7.3c0.9,0.5,1.8,1.1,2.8,1.9c1.6,1.3,3.4,3.1,4.7,5.5c1.9,5.5-1.9,14.9-1.9,14.9
-				c-2.3,7.6-18.4,40.6-18.4,40.6c-8.1-0.2-15.3,5-17.7,12.5c-2.6,8.1,1.1,17.3,8.9,21.3c7.8,4,17.4,1.7,22.5-5.3
-				c5-6.8,4.6-16.3-1.1-22.6c1.9-3.7,3.7-7.4,5.6-11.3c5-10.4,13.5-30.4,13.5-30.4c0.9-1.7,5.7-10.3,2.7-21.3
-				c-2.5-11.4-12.6-16.7-12.6-16.7c-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3c4.7-9.7,9.4-19.3,14.1-29
-				c-4.1-2-8.1-4-12.2-6.1c-4.8,9.8-9.7,19.7-14.5,29.5c-6.7-0.1-12.9,3.5-16.1,9.4c-3.4,6.3-2.7,14.1,1.9,19.8
-				C343.2,346.5,335,363.3,326.8,380.1z"/>
-		</g>
-	</g>
-</g>
+<svg viewBox="0 0 212 212" xmlns="http://www.w3.org/2000/svg">
+  <style type="text/css">
+    circle {
+      fill: none;
+      stroke: #000;
+      stroke-width: 15;
+    }
+    path {
+      fill: none;
+      stroke: #000;
+      stroke-width: 25;
+    }
+    .orange {
+      stroke:#ff6600;
+    }
+    .red {
+      stroke:#d40000;
+    }
+  </style>
+  <g transform="translate(6,6)">
+    <path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" class="orange" />
+    <path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" class="red" />
+    <circle cx="142" cy="20" r="18" class="orange" />
+    <circle cx="142" cy="88" r="18" class="red" />
+    <circle cx="58" cy="180" r="18" class="red" />
+  </g>
 </svg>
diff --git a/assets/logo.svg b/assets/logo.svg
index 9df6b83b56..bcacdc0200 100644
--- a/assets/logo.svg
+++ b/assets/logo.svg
@@ -1,31 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="main_outline" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 640 640" style="enable-background:new 0 0 640 640;" xml:space="preserve">
-<g>
-	<path id="teabag" style="fill:#FFFFFF" d="M395.9,484.2l-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5,21.2-17.9,33.8-11.8
-		c17.2,8.3,27.1,13,27.1,13l-0.1-109.2l16.7-0.1l0.1,117.1c0,0,57.4,24.2,83.1,40.1c3.7,2.3,10.2,6.8,12.9,14.4
-		c2.1,6.1,2,13.1-1,19.3l-61,126.9C423.6,484.9,408.4,490.3,395.9,484.2z"/>
-	<g>
-		<g>
-			<path style="fill:#609926" d="M622.7,149.8c-4.1-4.1-9.6-4-9.6-4s-117.2,6.6-177.9,8c-13.3,0.3-26.5,0.6-39.6,0.7c0,39.1,0,78.2,0,117.2
-				c-5.5-2.6-11.1-5.3-16.6-7.9c0-36.4-0.1-109.2-0.1-109.2c-29,0.4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5
-				c-9.8-0.6-22.5-2.1-39,1.5c-8.7,1.8-33.5,7.4-53.8,26.9C-4.9,212.4,6.6,276.2,8,285.8c1.7,11.7,6.9,44.2,31.7,72.5
-				c45.8,56.1,144.4,54.8,144.4,54.8s12.1,28.9,30.6,55.5c25,33.1,50.7,58.9,75.7,62c63,0,188.9-0.1,188.9-0.1s12,0.1,28.3-10.3
-				c14-8.5,26.5-23.4,26.5-23.4s12.9-13.8,30.9-45.3c5.5-9.7,10.1-19.1,14.1-28c0,0,55.2-117.1,55.2-231.1
-				C633.2,157.9,624.7,151.8,622.7,149.8z M125.6,353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6,321.8,60,295.4
-				c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5,38.5-30c13.8-3.7,31-3.1,31-3.1s7.1,59.4,15.7,94.2c7.2,29.2,24.8,77.7,24.8,77.7
-				S142.5,359.9,125.6,353.9z M425.9,461.5c0,0-6.1,14.5-19.6,15.4c-5.8,0.4-10.3-1.2-10.3-1.2s-0.3-0.1-5.3-2.1l-112.9-55
-				c0,0-10.9-5.7-12.8-15.6c-2.2-8.1,2.7-18.1,2.7-18.1L322,273c0,0,4.8-9.7,12.2-13c0.6-0.3,2.3-1,4.5-1.5c8.1-2.1,18,2.8,18,2.8
-				l110.7,53.7c0,0,12.6,5.7,15.3,16.2c1.9,7.4-0.5,14-1.8,17.2C474.6,363.8,425.9,461.5,425.9,461.5z"/>
-			<path style="fill:#609926" d="M326.8,380.1c-8.2,0.1-15.4,5.8-17.3,13.8c-1.9,8,2,16.3,9.1,20c7.7,4,17.5,1.8,22.7-5.4
-				c5.1-7.1,4.3-16.9-1.8-23.1l24-49.1c1.5,0.1,3.7,0.2,6.2-0.5c4.1-0.9,7.1-3.6,7.1-3.6c4.2,1.8,8.6,3.8,13.2,6.1
-				c4.8,2.4,9.3,4.9,13.4,7.3c0.9,0.5,1.8,1.1,2.8,1.9c1.6,1.3,3.4,3.1,4.7,5.5c1.9,5.5-1.9,14.9-1.9,14.9
-				c-2.3,7.6-18.4,40.6-18.4,40.6c-8.1-0.2-15.3,5-17.7,12.5c-2.6,8.1,1.1,17.3,8.9,21.3c7.8,4,17.4,1.7,22.5-5.3
-				c5-6.8,4.6-16.3-1.1-22.6c1.9-3.7,3.7-7.4,5.6-11.3c5-10.4,13.5-30.4,13.5-30.4c0.9-1.7,5.7-10.3,2.7-21.3
-				c-2.5-11.4-12.6-16.7-12.6-16.7c-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3c4.7-9.7,9.4-19.3,14.1-29
-				c-4.1-2-8.1-4-12.2-6.1c-4.8,9.8-9.7,19.7-14.5,29.5c-6.7-0.1-12.9,3.5-16.1,9.4c-3.4,6.3-2.7,14.1,1.9,19.8
-				C343.2,346.5,335,363.3,326.8,380.1z"/>
-		</g>
-	</g>
-</g>
+<svg viewBox="0 0 212 212" xmlns="http://www.w3.org/2000/svg">
+  <style type="text/css">
+    circle {
+      fill: none;
+      stroke: #000;
+      stroke-width: 15;
+    }
+    path {
+      fill: none;
+      stroke: #000;
+      stroke-width: 25;
+    }
+    .orange {
+      stroke:#ff6600;
+    }
+    .red {
+      stroke:#d40000;
+    }
+  </style>
+  <g transform="translate(6,6)">
+    <path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" class="orange" />
+    <path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" class="red" />
+    <circle cx="142" cy="20" r="18" class="orange" />
+    <circle cx="142" cy="88" r="18" class="red" />
+    <circle cx="58" cy="180" r="18" class="red" />
+  </g>
 </svg>
diff --git a/public/assets/img/apple-touch-icon.png b/public/assets/img/apple-touch-icon.png
index 0c803d35dc34c01281a52c460cee9e65e29ad60f..1f6c1544f80bcd94adfa05ef4683537266de020c 100644
GIT binary patch
delta 2702
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
IM6N<$f-tASLI3~&

delta 3158
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

diff --git a/public/assets/img/avatar_default.png b/public/assets/img/avatar_default.png
index 129967112d13ef602f6ec42f28b264c4666be2e0..f335e51dad13df7ceb19701a71f8efe192173286 100644
GIT binary patch
literal 3189
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
JzHjIe{a+<Cqk{kd

literal 4889
zcmaKwXEYlQpv7a>Ce*AETTzNwwFyC6dv9u0jnv*NRMaljs;z2|DiXU^sl6#7_NWzV
zuXyMGzQ1?Rx#!#u_kO?U7q6!Sr6gk^0{{S&TAC08008j&Ka&sx0Dx+<nmho2c0~)K
zVibtC-xUP_005B%cjb)b`2WTKS9a$kcovzgBt7QnbG6ccw-{?QvORrp0qId`*ldAD
zdZ3Zj^EF-nezb~~;(R*3s(jGK6|_#ad=Ki(7=`w@-=#K7QGN#-9!=n92Q#(*&3ak}
zyH0)m0sEp1QiQ9)r~I-MR4*1R(*s<LBIMwEDEE6TbH$J+P+_%h5=&qeOSsLG<Eg+J
zkJ;bU^xAC0bbhcQ-LnTuE%2Q=ue@_f&e>go&-~Fgl32rSg)djx@33b7QiIxsft7SS
zHJ#ZgoDENd-<*D5qbk*)J2fLBcg*}wSjyRzP5LXZk2W-c5X;|&z+*=eqPV(vnF_jS
zb9Ureql+)T6Iwb%o>`9z`8*1YMOWFwVq7Tl-=Zbn=~h6jx!A{JnVeV6e1@y%5{jgU
zP7071_jg_Uj#}6_ykvjE7{^iFrV{a0#mpm%ZYb%ppMzD~SXfod^G8$TS%U;4Z6owM
z{h?_`$=rc>r0nIN54;&y+--QD=Q7!GoCZJ0t7}T1fL0oz(&Pc-)H5^mo>LkU=GfdM
zMvhN=O<MAS!I*1LgW5RnI}dk;wR2c&Q&@6mCLbepYo@8MPt)0!4EwNDCy^$Mx4&Fo
z_OFYOT=W=S_|9s_E$KRELS@avR(36EZ~MPOf@aaSLtC$g(H~V#y}MsI4O`3qw&?9?
zY~!-Ih*4@Z6UJQYdIpy?H(x72xA1Vaf|)DEBBkBgR{pWIZv@V<RX%G~bbbRr5O_K(
zKB`#PGT15sbjjv6r6%m(aNGhecZCFL8Z;PG&q5n2+(i#RO`o~Z{}^{!;5Go(()$Iv
zqYUU<nHT5i4q9HAV-X>a=kUBo;s4~*du?1M{q^!Gchp1psVQrgp%IJy_^Z?v3DP2_
z;)q9to;$aLK&YPsm6&GIk@xm6@Et&j4l76bP$Y0gQ%o~B+(cc{Bre~Cv&$!}GOGKE
zn)Piq6ORJhpqm||EVZd-XD{eq8ER8a*55@WkvEWWKpvNW8gFZO`-y1-*W;A%F`kp#
z*m9vQe1#$hGOJF1DY#0j<E&QuX_c_a<fZnJ1?mBmf{XAow2}8Y%o8I7>6Xnoo6oup
z;qmeD^rL~xf9Q!ABI}mEO<lRjAzQz1jxj7Y><EdMvn_#P?&6mDhzBA$D$t)BSBrAU
zf@}7BPrX&Jn58ZtoFw$7@nf|ySmx7AkJ?El_@r0xD;eIbreTMB9aZ`h6XHt>%nucL
z)~vh8uj~I3GWXZyHka5~%~fKObdvbIjxBg;LsP}_J8U)u!tK*b*d0>U?p;#%@=jB<
z-Eods))iKBq>|13eZ9xeT%HgQG_v{pu+iftxw_E<E!BrqINSYHIby<>?rVJE>$iKO
zxNU7Jp1&($?RO;C#f-0o!?2r@h_of!nz4dc_g>bIsx$<#v;@*v=f9t>ElA7%47e^m
zD~WYxuEdyCvGtY(dAE3{67;2*)VOjb2kK}nHo#rc8$X}xf#$k4WjEOCY-X|<ir`hD
z)*N+-Xshy7Bh3*Sy1#VTW=pRx{xsxItla_`)suQ5sqWL+3}3!ghmI7$UEwkGvJ4rG
z3H-*xcxhsl6~T>gS2f@hS%%-rgKfv;AR1*F=>yOLtoR}TSR*yNa`;6@7@&O^d_u_P
zXlX@b@N(gE;Q9Q9>){vWj((g<X~W4E*|e&Fv#r+;>bi;hn<I3SiPhW^MTpP59TZ8p
z<g27bA3g~3EA*#PGucB$n<}fhg6bl1b$Js1JLyE;Jl;geSg)v_0O|l`l}G)`9@hxo
zIoRCUI;h5nkbxEQLj9stDK7|^WcBoY-;?kU9g+v^&%jsU15ioUHo<@bV_tui56xIH
zY@uqdWKrjWp{g`@KLR?1nb1Hvi<a09bBrEFw%_4U<w7<SR1Tf6xlJ~ng>|5SL1>y8
zp`wtL)b7bukE>+}`9X5@ARHt8{Qh!16nCS$MO9JzT3BvYMd|_0%7aM=noMM<>|yq6
zC@Q{q^}CkWi}rM6gXDysK>0w)z>uw-F(rQ}W6g_aS;l7_Izw(JXODPf-dspTQ&M?%
zdl4~M>r~+_#YXsD^R43bTXqR-`VrZbGGzp=q25qw%H;70hh_4KhKQ}O>16LIf1>@m
zZ|f@F1e2|!DIMcu{&`3s2;WgpnNrc>?~#qZ5A`r4PzZ!3iX_gjGCcb&)9(yR*C~`t
z+BC|TT#)DJXZqkvR-fK_73#rc&At=*Q?=mw*unwG#Dleygb2c?=|yj<5;W%u*Pi$;
zY-v8@I;#><w0&fxq-Bbr*yt??bN~wQ_-rh}mzV|j63PYW{bCgv{mf3gp^pJ0)s((n
zqu^_^zSsp$RabN*T%P;;rIZ5@zCL;xMHh!ItqzSH1chzB=^sUZop);8scUGE?AAA<
z{pWDNYHN-x=bXliZ|6d&%Xm1G9+EdnBMfHr-jCOKDLP^FSP;l$lNPsoqwD>q%I-Uy
zSV#8T2f&E_pRQvSHZ@>pM7k9J+xZhC{H7k*8;-|ID)7Skdbp>I{3k^v+`@NX8dv4?
zLz*15Ch}DW2Rs@E|G_>GfsIkFy1Ko&&*8!G#6Avev?8!aHBuz{vQ2E5m1pgP-DxQU
zS(s+@wl{fCdu#4@F|maFf+AnvhMTYuR)GabQuKB0h&j1FH3JpZWFkfI(_fLI3H%mS
zc)5vGOlG<#g6EIIBTWypA-1`pLZ)#<AzoW>BL-N*g^S|;;&r9W#o!8i3*m)&QKN9!
z8n+IJA#%c_!fW``2~>}};LF7j5jR0iJ8s-vFk69WFK1W4D_vxDW=W{Hax#mDs8_Ml
zW)lTv=&mLH+=N^AoQv@L=YhG2VP+M^M7!DFQcyKVoObZV#OoY_?TrzE7k({DJl|LG
zBvfBLXA5A)4ob0Q>AobqqHiNQjw}ytbL&AQ(RfqjS@ML!JeM;f?icW@t8R>!m~I)Q
z0PNR#*OTS+8>Xzv{a-7dAosKc7A03>IDXuJhqTrF`l$7S*f5eNO3%X(mMlH^qkSEY
z%L#Ci*Q|DYKFjq?@W5&&xy6fFwj~s_-Lu5~gydq>U_=ErFFBaG|BEwhb|~Fbqh#?B
z84>{Yd~Dn?$v^8SMoLvfgfi^A8r{&gHM%%A9gxN3g^SV`b~N*SmLqY|O=->%S(fXf
zg$_Jf9-@D-Fzu#~o|`hrf9d>;6oNIPMPl+=bKZ;lO)<Vxy3eXJot$}4@)jsEpJ;x9
zq@`8DciIG&YE2iqIk)dge-0eBD1NUUPr-m?XFKwF_bn&6-Ve3BsW)Ka#vr>HVgyTF
zEmDt~;tek}sXyeoR56CpWOyQ?chUS%+ueY>wAb4O9BkI{J8z&s$Ih=*IVA17mlsY`
z3mEsCBhiwg0Vb;{LD|C`PC3F`y%)7g3wNJm*OW5iNTNdsQRhY0%ndDtiPr=#&DLi-
zQjqA#ZeR0na^>#Cym^i;59WC*8*ansI;<4yEqVDVx6$(|dYnSqP#3v5)N$|5^ER)K
zhh-iWM-1R|-IYD09k;>QsYZcgR7}ap@(xyecjabJcizFAFKl4ODyvTADe-7c_VME7
zn>K2c0Lk1xuap-oWJJbs<B&}y9{FRw*ZMWqL6!S9Hr|S9L`8ZfWYGSWEl&0)Tfgt`
z==rT3=`0%~-Y23Su#UJ`pMG4g@`~}0eZF&)A#oQvS1xWDap1;V+pdAjCjo&s3_Fp9
zmPfdq^ziiz6RQmlo?DYXV3K7BF4;)1d-cP?A}_n7LlL-P8itSd7bnS}Aw4oITU#Qp
za<j9SVy<6PZ5m%^_x`jb_3Ce4ozcS$VVj&l_*hFyasD>F4GodL=rYYQb9YxvmZgLH
z4im$}DF-n9JAVsnj{$eyn-fNmaN>v1NunJxHUDYFSL7mFL}k460;8BrWv8cJA>t^1
zYr~J4fuCftSN{H~-Xb9)>3CxOxdIpoF2|%7QBF^MzKELJe4~DMZ`VY1#S)Wt@Pj#Z
z21xXCWI}Q$8!LmZ^x}oTeY3pY5fJ7hDLMFI>6N<()pjyU)p&#T95g$>A2;TrbnD<x
zVdWHug)bMiskRmlfl=p)Bl<?PR&k&oM_f^a89)An;`-@($w1?s>PZb+O8D(!XCnE2
zz#upG@^9juPAp%n*4p<&L0u&#F|A;{Oj%NX`eI6GLCI{e;NWQ6$HfIh>2MvVI^Qvw
zEES@LtA#Kxu6SP9x8oXu1+k9$zaNs7u`hluyI9BQ5G+#1aJWu;bBgmF4xfV&A7~O*
zwyV}}YjX+g4X_jHG{bxwvw2N8Zb5PZk$-y;!iU4>2MS|!x>RJ5)Gqqp`hiYlE)TLA
zR_Rs~gY0MQ8-}i{5**Z~4F|Y92Mlu*VNPLb2nqC(iXx|ffvy!qG<+5@_41Ze17|nb
zHwKG1Zax3gh&3>`d+~@hnj_6Fk=pr8zu=<BPcZF$;A|MpjYI6}2I#l;BY-UBuo88X
z)cboLJeT!Z=t+i3k}$n<z89Z=R3%~Znf%b$39O_LIY2TnWJ^(Gd@h*L_`D{a7Mp(W
zII2vaY|4$eThTTuxUt;V+m2jJTFqi_L)JuC`oM_kon~jvZ0tnd;7I~9IF0{g^L1R#
zlqicl6yyoqlpRrlQAy*2ec^W$!zzpbPOFEq*H!Vv!e8;JY={4Q($KaL3VmS1i35`J
z@UgvQpK^geY4i+!fmEU;UA`A#*<@wG2wDjf#;eb4wKHLS*;v0%jglr&EoOMp_3Mu4
zp!o+a91&dpUDQ1EQ0*;yGWNik?VZ}Oo1>CllsG45!w^^@dAjm1Hw@<yfOB)ppugeM
z5(<XoX#l%+84*)K0$nE@B=VtQ1Noiq9QFQko+Qaa-Wl3~H!y!Cx0tnEcdKsMx;S8Y
zUjqC3C;95$%{E)_UJgx}=sp3kZk^RoyYS;H!b+l>hodKc<u|~Gdgn28g+}ryhy234
z6lI0Q-)RNJLXcIdVS#<`k=NPWly9*A1_iW{Gj6GIDu@)ec~4YL!Vwo1*h?bkZ8|=-
zMX4@I+TACt^p>OIjhMdRblPj!Y~=FPPCyJ(E*aED08aZ7W_K-8Nr!$lvjqaiN&GB4
zDi7pJCEvWRAKRw>T4-RAKJ>Bd&xGDC1Y8((ZZ$;zvd<<ek9<gj8c-%od~>Jm=B+w>
z`Lm#JIK^x%7edG4I^BO)%r8aZQPzauc5srKNMI+w4pG@uFdK9`F%Asr{L$Xc&cf{l
z9Q&TPD38$LHjlIMtH1O;q%q`)H!y9h8XWEdLb$=q(mzY3f$tF~0mUFKmu{=%fFow{
z6G4F#Qzwv)7*`JD6>G*Sx-{U9m7)juS9wEuKKN<=oonBf3dhx?Nk@^kdXEo;n|QR;
zo7-Ydit9{xgSS{#dvT5bn=$d%A(-7-yr2w}{xmCIgVk~Cz@jEPSZMf~1}`AzcWijS
zIQKwYNUHs7gPV%R)_ned<Dfmy?OAIXZDTc3dc1h(Y2K?vmM=vxrN<S|Xboz~l%7s!
znq2B#4=8c7H1DR~YCZ^I7U@H<8&A_u=7D_9vbEb3^cJ-@zW$}desP_9xy`moZ()%Q
zt;YAFPSi65RfUZ6h`GJ|S!Q#;^Ju%q^jk4|d`s`Qu^=H|=HNsLim$iBYA20lgvJBo
z2~jb2QhTJ*@GpJh&pvZpzlLT%2RjFV^N!S{dcsOsM!V#+H=^}1lm6_-X(Uo8jZ-q<
z$;4^OS<XO8no0loqhx6^$2ds2r{4NOS9p25CU^}oW@j`+GrE-f^Bw;7`IlCz0(XR2
za?RAj;X`IF*PCwr;>T64-)Ki7du@OM=6Yz^OaG+<*`XGXt6#lVyfI7;)>)9Lbp2{X
z_9bD_^?CQ@UK@cNc?DG%x--^3H@lwU2Wo_%BIC#Qyeh9gKaGOd!Xe(o?11XOIog+F
z1a)Hmuk*_}v@O+l75Q0i#+3$6$V03a8VeOvq*dor<6bRB>>X1<JkCCk=z@`cAL_Fz
zUa5`Avo3(BG{NV@pVW}%Pp+dHXF;wyV7E>TSAaRcOGUM9RY;q|;64k*eH{<9D8;y5
zAEFHwd=_6>Tkb{cG33{)eFs?^Nu8Ucu0MTor5ZCA-$%+AFlTH~dg1om@3UiBNkl_`
zkCZ=Z99~!rpRd$g;U9&#EK(*Yxe8658QbHhFGi$#1ZwF~zeDOcmlM$HUOt(Kq5cDt
zYU8zmHse#HqWG96VnoAU1>Zk1U-8PWZJ2rb9Gkt;fdCXtC{vy6T_MsCSPAq)4XK3o
z$C!&<Q0eVW|Mlxj+Yp%We}L-g@8w`xIidfXRk7p6Y8|1TF=@B|*U?hffz+tlMgI?C
Clv>aL

diff --git a/public/assets/img/favicon.png b/public/assets/img/favicon.png
index dcd4edb1a30bf93049fd24c31317e3344e08d95b..eda0347effabb1b681c3816cfd3580b82227c063 100644
GIT binary patch
literal 2968
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

literal 4351
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

diff --git a/public/assets/img/favicon.svg b/public/assets/img/favicon.svg
index afeeacb77c..804b05e284 100644
--- a/public/assets/img/favicon.svg
+++ b/public/assets/img/favicon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" style="enable-background:new 0 0 640 640" xml:space="preserve" width="32" height="32"><path style="fill:#fff" d="m395.9 484.2-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5 21.2-17.9 33.8-11.8 17.2 8.3 27.1 13 27.1 13l-.1-109.2 16.7-.1.1 117.1s57.4 24.2 83.1 40.1c3.7 2.3 10.2 6.8 12.9 14.4 2.1 6.1 2 13.1-1 19.3l-61 126.9c-6.2 12.7-21.4 18.1-33.9 12z"/><path style="fill:#609926" d="M622.7 149.8c-4.1-4.1-9.6-4-9.6-4s-117.2 6.6-177.9 8c-13.3.3-26.5.6-39.6.7v117.2c-5.5-2.6-11.1-5.3-16.6-7.9 0-36.4-.1-109.2-.1-109.2-29 .4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5c-9.8-.6-22.5-2.1-39 1.5-8.7 1.8-33.5 7.4-53.8 26.9C-4.9 212.4 6.6 276.2 8 285.8c1.7 11.7 6.9 44.2 31.7 72.5 45.8 56.1 144.4 54.8 144.4 54.8s12.1 28.9 30.6 55.5c25 33.1 50.7 58.9 75.7 62 63 0 188.9-.1 188.9-.1s12 .1 28.3-10.3c14-8.5 26.5-23.4 26.5-23.4S547 483 565 451.5c5.5-9.7 10.1-19.1 14.1-28 0 0 55.2-117.1 55.2-231.1-1.1-34.5-9.6-40.6-11.6-42.6zM125.6 353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6 321.8 60 295.4c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5 38.5-30c13.8-3.7 31-3.1 31-3.1s7.1 59.4 15.7 94.2c7.2 29.2 24.8 77.7 24.8 77.7s-26.1-3.1-43-9.1zm300.3 107.6s-6.1 14.5-19.6 15.4c-5.8.4-10.3-1.2-10.3-1.2s-.3-.1-5.3-2.1l-112.9-55s-10.9-5.7-12.8-15.6c-2.2-8.1 2.7-18.1 2.7-18.1L322 273s4.8-9.7 12.2-13c.6-.3 2.3-1 4.5-1.5 8.1-2.1 18 2.8 18 2.8L467.4 315s12.6 5.7 15.3 16.2c1.9 7.4-.5 14-1.8 17.2-6.3 15.4-55 113.1-55 113.1z"/><path style="fill:#609926" d="M326.8 380.1c-8.2.1-15.4 5.8-17.3 13.8-1.9 8 2 16.3 9.1 20 7.7 4 17.5 1.8 22.7-5.4 5.1-7.1 4.3-16.9-1.8-23.1l24-49.1c1.5.1 3.7.2 6.2-.5 4.1-.9 7.1-3.6 7.1-3.6 4.2 1.8 8.6 3.8 13.2 6.1 4.8 2.4 9.3 4.9 13.4 7.3.9.5 1.8 1.1 2.8 1.9 1.6 1.3 3.4 3.1 4.7 5.5 1.9 5.5-1.9 14.9-1.9 14.9-2.3 7.6-18.4 40.6-18.4 40.6-8.1-.2-15.3 5-17.7 12.5-2.6 8.1 1.1 17.3 8.9 21.3 7.8 4 17.4 1.7 22.5-5.3 5-6.8 4.6-16.3-1.1-22.6 1.9-3.7 3.7-7.4 5.6-11.3 5-10.4 13.5-30.4 13.5-30.4.9-1.7 5.7-10.3 2.7-21.3-2.5-11.4-12.6-16.7-12.6-16.7-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3 4.7-9.7 9.4-19.3 14.1-29-4.1-2-8.1-4-12.2-6.1-4.8 9.8-9.7 19.7-14.5 29.5-6.7-.1-12.9 3.5-16.1 9.4-3.4 6.3-2.7 14.1 1.9 19.8l-24.6 50.4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 212 212" width="32" height="32"><style>circle,path{fill:none;stroke:#000;stroke-width:15}path{stroke-width:25}.orange{stroke:#f60}.red{stroke:#d40000}</style><g transform="translate(6 6)"><path d="M58 168V70a50 50 0 0 1 50-50h20" class="orange"/><path d="M58 168v-30a50 50 0 0 1 50-50h20" class="red"/><circle cx="142" cy="20" r="18" class="orange"/><circle cx="142" cy="88" r="18" class="red"/><circle cx="58" cy="180" r="18" class="red"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/img/forgejo.svg b/public/assets/img/forgejo.svg
new file mode 100644
index 0000000000..804b05e284
--- /dev/null
+++ b/public/assets/img/forgejo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 212 212" width="32" height="32"><style>circle,path{fill:none;stroke:#000;stroke-width:15}path{stroke-width:25}.orange{stroke:#f60}.red{stroke:#d40000}</style><g transform="translate(6 6)"><path d="M58 168V70a50 50 0 0 1 50-50h20" class="orange"/><path d="M58 168v-30a50 50 0 0 1 50-50h20" class="red"/><circle cx="142" cy="20" r="18" class="orange"/><circle cx="142" cy="88" r="18" class="red"/><circle cx="58" cy="180" r="18" class="red"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/img/gitea-original.svg b/public/assets/img/gitea-original.svg
new file mode 100644
index 0000000000..dca9b4f4db
--- /dev/null
+++ b/public/assets/img/gitea-original.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" width="32" height="32"><path d="M395.9 484.2l-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5 21.2-17.9 33.8-11.8 17.2 8.3 27.1 13 27.1 13l-.1-109.2 16.7-.1.1 117.1s57.4 24.2 83.1 40.1c3.7 2.3 10.2 6.8 12.9 14.4 2.1 6.1 2 13.1-1 19.3l-61 126.9c-6.2 12.7-21.4 18.1-33.9 12z" fill="#fff"/><g fill="#609926"><path d="M622.7 149.8c-4.1-4.1-9.6-4-9.6-4s-117.2 6.6-177.9 8c-13.3.3-26.5.6-39.6.7v117.2c-5.5-2.6-11.1-5.3-16.6-7.9 0-36.4-.1-109.2-.1-109.2-29 .4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5c-9.8-.6-22.5-2.1-39 1.5-8.7 1.8-33.5 7.4-53.8 26.9C-4.9 212.4 6.6 276.2 8 285.8c1.7 11.7 6.9 44.2 31.7 72.5 45.8 56.1 144.4 54.8 144.4 54.8s12.1 28.9 30.6 55.5c25 33.1 50.7 58.9 75.7 62 63 0 188.9-.1 188.9-.1s12 .1 28.3-10.3c14-8.5 26.5-23.4 26.5-23.4S547 483 565 451.5c5.5-9.7 10.1-19.1 14.1-28 0 0 55.2-117.1 55.2-231.1-1.1-34.5-9.6-40.6-11.6-42.6zM125.6 353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6 321.8 60 295.4c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5 38.5-30c13.8-3.7 31-3.1 31-3.1s7.1 59.4 15.7 94.2c7.2 29.2 24.8 77.7 24.8 77.7s-26.1-3.1-43-9.1zm300.3 107.6s-6.1 14.5-19.6 15.4c-5.8.4-10.3-1.2-10.3-1.2s-.3-.1-5.3-2.1l-112.9-55s-10.9-5.7-12.8-15.6c-2.2-8.1 2.7-18.1 2.7-18.1L322 273s4.8-9.7 12.2-13c.6-.3 2.3-1 4.5-1.5 8.1-2.1 18 2.8 18 2.8L467.4 315s12.6 5.7 15.3 16.2c1.9 7.4-.5 14-1.8 17.2-6.3 15.4-55 113.1-55 113.1z"/><path d="M326.8 380.1c-8.2.1-15.4 5.8-17.3 13.8-1.9 8 2 16.3 9.1 20 7.7 4 17.5 1.8 22.7-5.4 5.1-7.1 4.3-16.9-1.8-23.1l24-49.1c1.5.1 3.7.2 6.2-.5 4.1-.9 7.1-3.6 7.1-3.6 4.2 1.8 8.6 3.8 13.2 6.1 4.8 2.4 9.3 4.9 13.4 7.3.9.5 1.8 1.1 2.8 1.9 1.6 1.3 3.4 3.1 4.7 5.5 1.9 5.5-1.9 14.9-1.9 14.9-2.3 7.6-18.4 40.6-18.4 40.6-8.1-.2-15.3 5-17.7 12.5-2.6 8.1 1.1 17.3 8.9 21.3 7.8 4 17.4 1.7 22.5-5.3 5-6.8 4.6-16.3-1.1-22.6 1.9-3.7 3.7-7.4 5.6-11.3 5-10.4 13.5-30.4 13.5-30.4.9-1.7 5.7-10.3 2.7-21.3-2.5-11.4-12.6-16.7-12.6-16.7-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3 4.7-9.7 9.4-19.3 14.1-29-4.1-2-8.1-4-12.2-6.1-4.8 9.8-9.7 19.7-14.5 29.5-6.7-.1-12.9 3.5-16.1 9.4-3.4 6.3-2.7 14.1 1.9 19.8l-24.6 50.4z"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/img/gitea.svg b/public/assets/img/gitea.svg
index dca9b4f4db..804b05e284 100644
--- a/public/assets/img/gitea.svg
+++ b/public/assets/img/gitea.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" width="32" height="32"><path d="M395.9 484.2l-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5 21.2-17.9 33.8-11.8 17.2 8.3 27.1 13 27.1 13l-.1-109.2 16.7-.1.1 117.1s57.4 24.2 83.1 40.1c3.7 2.3 10.2 6.8 12.9 14.4 2.1 6.1 2 13.1-1 19.3l-61 126.9c-6.2 12.7-21.4 18.1-33.9 12z" fill="#fff"/><g fill="#609926"><path d="M622.7 149.8c-4.1-4.1-9.6-4-9.6-4s-117.2 6.6-177.9 8c-13.3.3-26.5.6-39.6.7v117.2c-5.5-2.6-11.1-5.3-16.6-7.9 0-36.4-.1-109.2-.1-109.2-29 .4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5c-9.8-.6-22.5-2.1-39 1.5-8.7 1.8-33.5 7.4-53.8 26.9C-4.9 212.4 6.6 276.2 8 285.8c1.7 11.7 6.9 44.2 31.7 72.5 45.8 56.1 144.4 54.8 144.4 54.8s12.1 28.9 30.6 55.5c25 33.1 50.7 58.9 75.7 62 63 0 188.9-.1 188.9-.1s12 .1 28.3-10.3c14-8.5 26.5-23.4 26.5-23.4S547 483 565 451.5c5.5-9.7 10.1-19.1 14.1-28 0 0 55.2-117.1 55.2-231.1-1.1-34.5-9.6-40.6-11.6-42.6zM125.6 353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6 321.8 60 295.4c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5 38.5-30c13.8-3.7 31-3.1 31-3.1s7.1 59.4 15.7 94.2c7.2 29.2 24.8 77.7 24.8 77.7s-26.1-3.1-43-9.1zm300.3 107.6s-6.1 14.5-19.6 15.4c-5.8.4-10.3-1.2-10.3-1.2s-.3-.1-5.3-2.1l-112.9-55s-10.9-5.7-12.8-15.6c-2.2-8.1 2.7-18.1 2.7-18.1L322 273s4.8-9.7 12.2-13c.6-.3 2.3-1 4.5-1.5 8.1-2.1 18 2.8 18 2.8L467.4 315s12.6 5.7 15.3 16.2c1.9 7.4-.5 14-1.8 17.2-6.3 15.4-55 113.1-55 113.1z"/><path d="M326.8 380.1c-8.2.1-15.4 5.8-17.3 13.8-1.9 8 2 16.3 9.1 20 7.7 4 17.5 1.8 22.7-5.4 5.1-7.1 4.3-16.9-1.8-23.1l24-49.1c1.5.1 3.7.2 6.2-.5 4.1-.9 7.1-3.6 7.1-3.6 4.2 1.8 8.6 3.8 13.2 6.1 4.8 2.4 9.3 4.9 13.4 7.3.9.5 1.8 1.1 2.8 1.9 1.6 1.3 3.4 3.1 4.7 5.5 1.9 5.5-1.9 14.9-1.9 14.9-2.3 7.6-18.4 40.6-18.4 40.6-8.1-.2-15.3 5-17.7 12.5-2.6 8.1 1.1 17.3 8.9 21.3 7.8 4 17.4 1.7 22.5-5.3 5-6.8 4.6-16.3-1.1-22.6 1.9-3.7 3.7-7.4 5.6-11.3 5-10.4 13.5-30.4 13.5-30.4.9-1.7 5.7-10.3 2.7-21.3-2.5-11.4-12.6-16.7-12.6-16.7-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3 4.7-9.7 9.4-19.3 14.1-29-4.1-2-8.1-4-12.2-6.1-4.8 9.8-9.7 19.7-14.5 29.5-6.7-.1-12.9 3.5-16.1 9.4-3.4 6.3-2.7 14.1 1.9 19.8l-24.6 50.4z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 212 212" width="32" height="32"><style>circle,path{fill:none;stroke:#000;stroke-width:15}path{stroke-width:25}.orange{stroke:#f60}.red{stroke:#d40000}</style><g transform="translate(6 6)"><path d="M58 168V70a50 50 0 0 1 50-50h20" class="orange"/><path d="M58 168v-30a50 50 0 0 1 50-50h20" class="red"/><circle cx="142" cy="20" r="18" class="orange"/><circle cx="142" cy="88" r="18" class="red"/><circle cx="58" cy="180" r="18" class="red"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/img/logo.png b/public/assets/img/logo.png
index c7971f91835e889ed15a0e5252734400c5c65cae..1b2d9b4023427395448912e39a9883c279dc1618 100644
GIT binary patch
literal 6747
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

literal 14354
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
aFyzSH&MYj4=hGek4$4X?Nmhy*ef>Wah!K+j

diff --git a/public/assets/img/logo.svg b/public/assets/img/logo.svg
index afeeacb77c..804b05e284 100644
--- a/public/assets/img/logo.svg
+++ b/public/assets/img/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" style="enable-background:new 0 0 640 640" xml:space="preserve" width="32" height="32"><path style="fill:#fff" d="m395.9 484.2-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5 21.2-17.9 33.8-11.8 17.2 8.3 27.1 13 27.1 13l-.1-109.2 16.7-.1.1 117.1s57.4 24.2 83.1 40.1c3.7 2.3 10.2 6.8 12.9 14.4 2.1 6.1 2 13.1-1 19.3l-61 126.9c-6.2 12.7-21.4 18.1-33.9 12z"/><path style="fill:#609926" d="M622.7 149.8c-4.1-4.1-9.6-4-9.6-4s-117.2 6.6-177.9 8c-13.3.3-26.5.6-39.6.7v117.2c-5.5-2.6-11.1-5.3-16.6-7.9 0-36.4-.1-109.2-.1-109.2-29 .4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5c-9.8-.6-22.5-2.1-39 1.5-8.7 1.8-33.5 7.4-53.8 26.9C-4.9 212.4 6.6 276.2 8 285.8c1.7 11.7 6.9 44.2 31.7 72.5 45.8 56.1 144.4 54.8 144.4 54.8s12.1 28.9 30.6 55.5c25 33.1 50.7 58.9 75.7 62 63 0 188.9-.1 188.9-.1s12 .1 28.3-10.3c14-8.5 26.5-23.4 26.5-23.4S547 483 565 451.5c5.5-9.7 10.1-19.1 14.1-28 0 0 55.2-117.1 55.2-231.1-1.1-34.5-9.6-40.6-11.6-42.6zM125.6 353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6 321.8 60 295.4c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5 38.5-30c13.8-3.7 31-3.1 31-3.1s7.1 59.4 15.7 94.2c7.2 29.2 24.8 77.7 24.8 77.7s-26.1-3.1-43-9.1zm300.3 107.6s-6.1 14.5-19.6 15.4c-5.8.4-10.3-1.2-10.3-1.2s-.3-.1-5.3-2.1l-112.9-55s-10.9-5.7-12.8-15.6c-2.2-8.1 2.7-18.1 2.7-18.1L322 273s4.8-9.7 12.2-13c.6-.3 2.3-1 4.5-1.5 8.1-2.1 18 2.8 18 2.8L467.4 315s12.6 5.7 15.3 16.2c1.9 7.4-.5 14-1.8 17.2-6.3 15.4-55 113.1-55 113.1z"/><path style="fill:#609926" d="M326.8 380.1c-8.2.1-15.4 5.8-17.3 13.8-1.9 8 2 16.3 9.1 20 7.7 4 17.5 1.8 22.7-5.4 5.1-7.1 4.3-16.9-1.8-23.1l24-49.1c1.5.1 3.7.2 6.2-.5 4.1-.9 7.1-3.6 7.1-3.6 4.2 1.8 8.6 3.8 13.2 6.1 4.8 2.4 9.3 4.9 13.4 7.3.9.5 1.8 1.1 2.8 1.9 1.6 1.3 3.4 3.1 4.7 5.5 1.9 5.5-1.9 14.9-1.9 14.9-2.3 7.6-18.4 40.6-18.4 40.6-8.1-.2-15.3 5-17.7 12.5-2.6 8.1 1.1 17.3 8.9 21.3 7.8 4 17.4 1.7 22.5-5.3 5-6.8 4.6-16.3-1.1-22.6 1.9-3.7 3.7-7.4 5.6-11.3 5-10.4 13.5-30.4 13.5-30.4.9-1.7 5.7-10.3 2.7-21.3-2.5-11.4-12.6-16.7-12.6-16.7-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3 4.7-9.7 9.4-19.3 14.1-29-4.1-2-8.1-4-12.2-6.1-4.8 9.8-9.7 19.7-14.5 29.5-6.7-.1-12.9 3.5-16.1 9.4-3.4 6.3-2.7 14.1 1.9 19.8l-24.6 50.4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 212 212" width="32" height="32"><style>circle,path{fill:none;stroke:#000;stroke-width:15}path{stroke-width:25}.orange{stroke:#f60}.red{stroke:#d40000}</style><g transform="translate(6 6)"><path d="M58 168V70a50 50 0 0 1 50-50h20" class="orange"/><path d="M58 168v-30a50 50 0 0 1 50-50h20" class="red"/><circle cx="142" cy="20" r="18" class="orange"/><circle cx="142" cy="88" r="18" class="red"/><circle cx="58" cy="180" r="18" class="red"/></g></svg>
\ No newline at end of file

From c8bb51718360d1e90716c5c6253c55a6d7817a7e Mon Sep 17 00:00:00 2001
From: Gusted <gusted@noreply.codeberg.org>
Date: Sun, 18 Dec 2022 19:03:34 +0000
Subject: [PATCH 02/36] [BRANDING] Rebrand systemd service (#137)

- We can rebrand this quite safely, as only new installations would likely look into this file and configure the correct folders(to use forgejo instead of gitea).

Co-authored-by: Gusted <postmaster@gusted.xyz>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/137
(cherry picked from commit fa78e52b5d25556b4a4313c4ac78edf6306c5bbe)
(cherry picked from commit e36d649989a69a1761c3d7cc709f97f80c8d378a)
(cherry picked from commit 37e15a2f4108c4b7e082a69fb8cb77068fa6dc15)
(cherry picked from commit a09a4b3ce0b6f63ac44bf4ea0f4ba275a9915598)
(cherry picked from commit 3096b37c950db77296f22d16d64efe3737246a4b)
(cherry picked from commit 187ad96c94b7fbc261c88a4ff513066acc562642)
(cherry picked from commit e15eb31c6e6310d14175cc270707d7cbfb95b819)
(cherry picked from commit e276abe3410cef5fe63bf05c6f089ed4a3da49dc)
(cherry picked from commit 31223db5e3290ccf67a504db1937e5adb903b204)
(cherry picked from commit 8ebffe0b71db27b40f2049ca77878748e6756ec1)
(cherry picked from commit 1d198363469814584c50e4717a7f96cafb06aa46)
(cherry picked from commit baaf749ce07f978466d6c397c1ed6bb6a1c75330)

Conflicts:
	contrib/systemd/forgejo.service
(cherry picked from commit c309b1a1f4fa2942218352a6ec3edbf39efb9a11)
(cherry picked from commit d6f57409dacf2645cd19bcd8a79219a9a8c1bffe)
(cherry picked from commit c6e665b0380f1d70c8c378b65c369a85eab9664c)
(cherry picked from commit 8764e26c434ec8027acaaabdf65e3122e5965178)
(cherry picked from commit a0560e454b4d5d7dac357a95dbaeb2b187a173ff)
(cherry picked from commit e074e83094866421f94cb3cef912794a31b88c82)
(cherry picked from commit 605b84bc779d41deac03595c8ddb7fa12b2b24e8)
(cherry picked from commit 35b233202058e219dec5acfc72ff0d7085a41318)
(cherry picked from commit b9c396f29566ec064a7c4031d4f766a25594eba4)
(cherry picked from commit 83a7e91bad1d99092c8c553ce740c65256901abb)
(cherry picked from commit 3794ad271a40bb4212cb14e24a6100b539d3a776)
(cherry picked from commit 818451287d166658f6ce18892a6ed9811324aa67)
(cherry picked from commit ec9bc9e6417fd7df3e636c231fb80a3442972542)
(cherry picked from commit 8434efaed8637351f6fe53c01dd4fb3edf09fce1)
(cherry picked from commit 3b1a4b7f389e7548f94d2d1b742de086aa77bfc6)
(cherry picked from commit c186b5a3e51c24f795967dc4811d89ed0b841b24)
(cherry picked from commit e35d92de1f37bea0a593093678f093845955e3fc)
---
 .../{gitea.service => forgejo.service}        | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)
 rename contrib/systemd/{gitea.service => forgejo.service} (59%)

diff --git a/contrib/systemd/gitea.service b/contrib/systemd/forgejo.service
similarity index 59%
rename from contrib/systemd/gitea.service
rename to contrib/systemd/forgejo.service
index c097fb0d17..0b8c8cccbf 100644
--- a/contrib/systemd/gitea.service
+++ b/contrib/systemd/forgejo.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Gitea (Git with a cup of tea)
+Description=Forgejo (Beyond coding. We forge.)
 After=syslog.target
 After=network.target
 ###
@@ -25,21 +25,21 @@ After=network.target
 # If using socket activation for main http/s
 ###
 #
-#After=gitea.main.socket
-#Requires=gitea.main.socket
+#After=forgejo.main.socket
+#Requires=forgejo.main.socket
 #
 ###
-# (You can also provide gitea an http fallback and/or ssh socket too)
+# (You can also provide forgejo an http fallback and/or ssh socket too)
 #
-# An example of /etc/systemd/system/gitea.main.socket
+# An example of /etc/systemd/system/forgejo.main.socket
 ###
 ##
 ## [Unit]
-## Description=Gitea Web Socket
-## PartOf=gitea.service
+## Description=Forgejo Web Socket
+## PartOf=forgejo.service
 ##
 ## [Socket]
-## Service=gitea.service
+## Service=forgejo.service
 ## ListenStream=<some_port>
 ## NoDelay=true
 ##
@@ -55,13 +55,13 @@ RestartSec=2s
 Type=notify
 User=git
 Group=git
-WorkingDirectory=/var/lib/gitea/
-# If using Unix socket: tells systemd to create the /run/gitea folder, which will contain the gitea.sock file
-# (manually creating /run/gitea doesn't work, because it would not persist across reboots)
-#RuntimeDirectory=gitea
-ExecStart=/usr/local/bin/gitea web --config /etc/gitea/app.ini
+WorkingDirectory=/var/lib/forgejo/
+# If using Unix socket: tells systemd to create the /run/forgejo folder, which will contain the forgejo.sock file
+# (manually creating /run/forgejo doesn't work, because it would not persist across reboots)
+#RuntimeDirectory=forgejo
+ExecStart=/usr/local/bin/forgejo web --config /etc/forgejo/app.ini
 Restart=always
-Environment=USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/gitea
+Environment=USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/forgejo
 WatchdogSec=30s
 # If you install Git to directory prefix other than default PATH (which happens
 # for example if you install other versions of Git side-to-side with
@@ -69,15 +69,15 @@ WatchdogSec=30s
 # Don't forget to place git-lfs binary on the PATH below if you want to enable
 # Git LFS support
 #Environment=PATH=/path/to/git/bin:/bin:/sbin:/usr/bin:/usr/sbin
-# If you want to bind Gitea to a port below 1024, uncomment
-# the two values below, or use socket activation to pass Gitea its ports as above
+# If you want to bind Forgejo to a port below 1024, uncomment
+# the two values below, or use socket activation to pass Forgejo its ports as above
 ###
 #CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 #AmbientCapabilities=CAP_NET_BIND_SERVICE
 ###
 # In some cases, when using CapabilityBoundingSet and AmbientCapabilities option, you may want to
-# set the following value to false to allow capabilities to be applied on gitea process. The following
-# value if set to true sandboxes gitea service and prevent any processes from running with privileges
+# set the following value to false to allow capabilities to be applied on Forgejo process. The following
+# value if set to true sandboxes Forgejo service and prevent any processes from running with privileges
 # in the host user namespace.
 ###
 #PrivateUsers=false

From 9651bcf9c6c81451b6e2fdb736f3f6c1e133afe1 Mon Sep 17 00:00:00 2001
From: Caesar Schinas <caesar@caesarschinas.com>
Date: Sun, 18 Dec 2022 23:03:28 -1000
Subject: [PATCH 03/36] [BRANDING] Rebrand footer "powered by" links

(cherry picked from commit 8b9237e47e067db4cb8b1d477865d75b258bee1e)
(cherry picked from commit 47e5543f33a9dafac5517cb5cb29d0fe6d266e2a)
(cherry picked from commit 456abff8c0567168b1a6c0d02d6830404d1b0dd3)
(cherry picked from commit 2d2588187ec20cb2f552cd3ee2b04a541909dc5c)
(cherry picked from commit a81e4e2588af2d1e9db253ca51649451d8dd94cf)
(cherry picked from commit 70c4ee8fbad69efcc02493ab8e1c692573ac0409)
(cherry picked from commit f12b0577e89ae223dc239c7ace5c692d30cd0e9b)
(cherry picked from commit 025e6e1974c8066c27e918020a6094fc8372f521)
(cherry picked from commit e051684c83e369177d22a77bff46e82998495267)
(cherry picked from commit ee370f3f3cf5ec81e170fc16c8ef982b47c99797)
(cherry picked from commit a1b53a8b883559a31b16a15a383ac5fe25a62189)
(cherry picked from commit e01158af9b037cff4248b0b577505023c9564b7e)
(cherry picked from commit c9f6b6c8a18b39e804e8464dfc80178af3efdada)
(cherry picked from commit 6abaa468d5cc1ae7f59b9026f4221b15911f3ba1)
(cherry picked from commit d039148bc83d6957435f2d3fd00b5f18c9af99e2)
(cherry picked from commit d3aadcac8bf4e136bb16e86702831cbcb6e6692f)
(cherry picked from commit e739f46aaef7d162bf42f152b665349e25aadc1b)
(cherry picked from commit 228671e72353a1366488cd28406478ee866f823f)
(cherry picked from commit 8965f9bdf248dfb80b80269d565ff17e8437a411)
(cherry picked from commit 5e97896da347dcfb592eb0bcef172652f43fed90)
(cherry picked from commit df8bdce12a1ef0d4578fca2b55d30c9f981feabb)
(cherry picked from commit 33ecf86e423c4481cb34de4a2c6d743602631891)
(cherry picked from commit 038ac822db5be6ad65f09050bb60cb0f2afffe66)
(cherry picked from commit 6decbafd3a3d53f9dc9ae58da302968b31aca32a)
(cherry picked from commit ad2b719be5629bf4ed544666a294a2f5c040da92)
(cherry picked from commit d9b2f11a7b778b71f06f0256ccba188dee445f79)
(cherry picked from commit 102033346275114f8de5f682749bda125c15a769)
(cherry picked from commit c1279c7d45fe91cae6e88c143280601e9b866bee)
(cherry picked from commit a0dfccbba42b498aa4024956eedcb3de12ed2db5)

Conflicts:
	templates/base/footer_content.tmpl
	https://codeberg.org/forgejo/forgejo/pulls/1420
---
 templates/base/footer_content.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index ad666152a0..212d01fff4 100644
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -1,6 +1,6 @@
 <footer class="page-footer" role="group" aria-label="{{.locale.Tr "aria.footer"}}">
 	<div class="left-links" role="contentinfo" aria-label="{{.locale.Tr "aria.footer.software"}}">
-		<a target="_blank" rel="noopener noreferrer" href="https://about.gitea.com">{{.locale.Tr "powered_by" "Gitea"}}</a>
+		<a target="_blank" rel="noopener noreferrer" href="https://forgejo.org">{{.locale.Tr "powered_by" "Forgejo"}}</a>
 		{{if (or .ShowFooterVersion .PageIsAdmin)}}
 			{{.locale.Tr "version"}}:
 			{{if .IsAdmin}}

From e1f6cb4ed607f17da4bedf36fe60af9d4a492089 Mon Sep 17 00:00:00 2001
From: Caesar Schinas <caesar@caesarschinas.com>
Date: Mon, 19 Dec 2022 00:05:51 -1000
Subject: [PATCH 04/36] [BRANDING] Add `forgejo` emoji

(cherry picked from commit ade55ad308ea0ac6bb36903e3a69b02d18228adb)
(cherry picked from commit 107f7266183584b51299351961b73ab2b185f24b)
(cherry picked from commit f29cf9cfc107692cd79a4ba4062a66f90813bc4e)
(cherry picked from commit 0761a41eee30a32c822834ca2b989ad6343ed1e0)
(cherry picked from commit 2b1fd9565f615dde8bdd07d86ff3a5ca3815af67)
(cherry picked from commit 6a7c82f13b17df1fa647130d086fbcdbeb086571)
(cherry picked from commit 4a56d404942562e3f5a45abd45518bc8679109b6)
(cherry picked from commit b48e3e896d0d3942362b5a1c18f847ffd64609cb)
(cherry picked from commit bde83340cbcce8370d524da9c909731c78544c49)
(cherry picked from commit 74e0603d6be22d8d74d38f9c99c8bcf26dd83482)
(cherry picked from commit 84bd1ddc082aa55a7d7c03eeac55478f0e15e019)
(cherry picked from commit 62d9acde2a0692f46257dc3db329e0196b74837a)
(cherry picked from commit 5b84a909135a4d71c778a2d0719a20ff01abef64)
(cherry picked from commit 5362f7d053f4e8bd6a91d93ddbcb6d291a250efe)
(cherry picked from commit 65ad7d1bd9875b6dd00f3ef31bc1d5ef2b9e84f5)
(cherry picked from commit 6e42d545a97ef7d470b57f6ae43ae15fa1581a37)
(cherry picked from commit 24d3bb33e2031a44c535602a7a083194acacbff1)
(cherry picked from commit 704935cadd997dcc1dea5e51a089ed25ec1ccab1)
(cherry picked from commit 5d9fc59e17c9be563432376c3b7d1851300ccdac)
(cherry picked from commit 4c95df3f86f9e778a9d1267cdca22c4ce15ffb94)
(cherry picked from commit 1ac704762ac78ba2a86a787f02de45779d765673)
(cherry picked from commit 0da9fb13189b0bff21a734c0f635ec196731a91f)
(cherry picked from commit bc2de51eeffea7fb4c5b53e7a72cab315af8215a)
(cherry picked from commit ea897a20b91e89be48570ca923dcbea1b4baf81e)
(cherry picked from commit 66f3f9c6effd19ca6762437e7756bd3ac564a6f3)
(cherry picked from commit edc5c3c3043867ea01b93f50ca83014592ef89b6)
(cherry picked from commit 11dd4f31a49b5448d4207c928df6be647adf5ce0)
(cherry picked from commit bf0fb77afb91dfff7ba81a59bbf5506a6b0a6462)
(cherry picked from commit 3a823b1001817b906c31453ff86d43ebe6bf9719)
---
 modules/setting/ui.go               |   4 ++--
 public/assets/img/emoji/forgejo.png | Bin 0 -> 3189 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 public/assets/img/emoji/forgejo.png

diff --git a/modules/setting/ui.go b/modules/setting/ui.go
index 41438db40d..4116da1166 100644
--- a/modules/setting/ui.go
+++ b/modules/setting/ui.go
@@ -79,8 +79,8 @@ var UI = struct {
 	DefaultTheme:        `auto`,
 	Themes:              []string{`auto`, `gitea`, `arc-green`},
 	Reactions:           []string{`+1`, `-1`, `laugh`, `hooray`, `confused`, `heart`, `rocket`, `eyes`},
-	CustomEmojis:        []string{`git`, `gitea`, `codeberg`, `gitlab`, `github`, `gogs`},
-	CustomEmojisMap:     map[string]string{"git": ":git:", "gitea": ":gitea:", "codeberg": ":codeberg:", "gitlab": ":gitlab:", "github": ":github:", "gogs": ":gogs:"},
+	CustomEmojis:        []string{`git`, `gitea`, `codeberg`, `gitlab`, `github`, `gogs`, `forgejo`},
+	CustomEmojisMap:     map[string]string{"git": ":git:", "gitea": ":gitea:", "codeberg": ":codeberg:", "gitlab": ":gitlab:", "github": ":github:", "gogs": ":gogs:", "forgejo": ":forgejo:"},
 	Notification: struct {
 		MinTimeout            time.Duration
 		TimeoutStep           time.Duration
diff --git a/public/assets/img/emoji/forgejo.png b/public/assets/img/emoji/forgejo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f335e51dad13df7ceb19701a71f8efe192173286
GIT binary patch
literal 3189
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
JzHjIe{a+<Cqk{kd

literal 0
HcmV?d00001


From bc4a8bf9bcb75e92b7802c477b1bb14a047344a6 Mon Sep 17 00:00:00 2001
From: Caesar Schinas <caesar@noreply.codeberg.org>
Date: Mon, 19 Dec 2022 20:01:46 +0000
Subject: [PATCH 05/36] [BRANDING] Rebrand default config settings for new
 installs (#140)

Replaces `Gitea` with `Forgejo` in the default config settings for new installs.

This will not affect existing installs.

Co-authored-by: Caesar Schinas <caesar@caesarschinas.com>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/140
Co-authored-by: Caesar Schinas <caesar@noreply.codeberg.org>
Co-committed-by: Caesar Schinas <caesar@noreply.codeberg.org>
(cherry picked from commit ca1319aa16128516e50dabdc8e8cadc23eb71d2f)
(cherry picked from commit 52a4d238a0b5bbea28b28e55e35f28c51ecbb2de)
(cherry picked from commit f63536538cfe4b010ebb5a6323f4b5e5b6ec7232)

Conflicts:
	web_src/js/features/install.js
(cherry picked from commit 861cc434e129f3fbd932ee36067c560e754dab9a)
(cherry picked from commit 0e6ea60c802d6cfd95dea4aad5df96bb6e4bc7a5)
(cherry picked from commit 0cbc0ec15d9d952b0ecfb68a36bf58cbae0c43dd)
(cherry picked from commit 3cc19b0ae214ae163f23efa52ab0aa53eb7c935b)
(cherry picked from commit 50fcb885fe2f87a27e6ff778cdd0c7cd97bbe9e9)
(cherry picked from commit f6039d4df481fc58b8db3e863158665d24cac847)
(cherry picked from commit 5ae5c6ba2deefe829f768900f5e1bbcbe9389e15)
(cherry picked from commit f0b565e0ed7fe52f0264e92c49736b487b9bff8a)
(cherry picked from commit adbd4d2015e8e2c4789849c84cfa4032acd40b7f)
(cherry picked from commit d26c540ffdbfb7ec83412635576ab39653d1b531)
(cherry picked from commit 6df6781b42ea126d029ba9e85485dbcb9bf6601d)
(cherry picked from commit b6fb56e1c407195bedfe09f91ecb6537024d5189)
(cherry picked from commit bb4f98a0ca7515aa6c44529df0573195f779a643)
(cherry picked from commit 6779229f2732f6791aba3bd1ba51a338a88ca1f3)
(cherry picked from commit c216c85aee552aa15e9d6316002ee9e170de64d7)
(cherry picked from commit dff780bced1dc78ddd7fa4952766969ee528c538)
(cherry picked from commit 4e036aa3b6d1bc5f2041c3b30ec289cb082fe824)
(cherry picked from commit 8b3bc3e8a64edaba64cb759ea31248eea7307937)
(cherry picked from commit 1e4d8523321efaf6c5febdd77ba5150effe5c1ac)
(cherry picked from commit 07a15d18447bb03bb04001f1f65305670d1467ef)
(cherry picked from commit fb44b3e10d685dd180f37678a3e2a64ee641f2b2)
(cherry picked from commit b212d833190ce59230b3fc288c1aac5106cf33a0)
(cherry picked from commit 5754971be5c37e97f3165878af3760117e40af01)
(cherry picked from commit 0c43b4e82cab028fae1b709c549251d63a3ffc04)

Conflicts:
	routers/install/install.go
	https://codeberg.org/forgejo/forgejo/pulls/1351
(cherry picked from commit 2e22a7208a0f149afc3794425c7b5b2b0181a939)
(cherry picked from commit 676b0a8a48f99d751b677b9eca5b57238b5003a5)
---
 custom/conf/app.example.ini    | 2 +-
 modules/setting/database.go    | 2 +-
 modules/setting/repository.go  | 2 +-
 modules/setting/server.go      | 2 +-
 routers/install/install.go     | 2 +-
 web_src/js/features/install.js | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index abf4d459b1..2ec37cc73c 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -368,7 +368,7 @@ USER = root
 ;; SQLite Configuration
 ;;
 ;DB_TYPE = sqlite3
-;PATH= ; defaults to data/gitea.db
+;PATH= ; defaults to data/forgejo.db
 ;SQLITE_TIMEOUT = ; Query timeout defaults to: 500
 ;SQLITE_JOURNAL_MODE = ; defaults to sqlite database default (often DELETE), can be used to enable WAL mode. https://www.sqlite.org/pragma.html#pragma_journal_mode
 ;;
diff --git a/modules/setting/database.go b/modules/setting/database.go
index 709655368c..d3e6afe1f8 100644
--- a/modules/setting/database.go
+++ b/modules/setting/database.go
@@ -69,7 +69,7 @@ func loadDBSetting(rootCfg ConfigProvider) {
 	Database.SSLMode = sec.Key("SSL_MODE").MustString("disable")
 	Database.MysqlCharset = sec.Key("MYSQL_CHARSET").MustString("utf8mb4") // do not document it, end users won't need it.
 
-	Database.Path = sec.Key("PATH").MustString(filepath.Join(AppDataPath, "gitea.db"))
+	Database.Path = sec.Key("PATH").MustString(filepath.Join(AppDataPath, "forgejo.db"))
 	Database.Timeout = sec.Key("SQLITE_TIMEOUT").MustInt(500)
 	Database.SQLiteJournalMode = sec.Key("SQLITE_JOURNAL_MODE").MustString("")
 
diff --git a/modules/setting/repository.go b/modules/setting/repository.go
index 42ffb99138..2d15a58937 100644
--- a/modules/setting/repository.go
+++ b/modules/setting/repository.go
@@ -276,7 +276,7 @@ func loadRepositoryFrom(rootCfg ConfigProvider) {
 	Repository.GoGetCloneURLProtocol = sec.Key("GO_GET_CLONE_URL_PROTOCOL").MustString("https")
 	Repository.MaxCreationLimit = sec.Key("MAX_CREATION_LIMIT").MustInt(-1)
 	Repository.DefaultBranch = sec.Key("DEFAULT_BRANCH").MustString(Repository.DefaultBranch)
-	RepoRootPath = sec.Key("ROOT").MustString(path.Join(AppDataPath, "gitea-repositories"))
+	RepoRootPath = sec.Key("ROOT").MustString(path.Join(AppDataPath, "forgejo-repositories"))
 	if !filepath.IsAbs(RepoRootPath) {
 		RepoRootPath = filepath.Join(AppWorkPath, RepoRootPath)
 	} else {
diff --git a/modules/setting/server.go b/modules/setting/server.go
index 08eb82fb3d..964a8162f5 100644
--- a/modules/setting/server.go
+++ b/modules/setting/server.go
@@ -168,7 +168,7 @@ func MakeAbsoluteAssetURL(appURL, staticURLPrefix string) string {
 
 func loadServerFrom(rootCfg ConfigProvider) {
 	sec := rootCfg.Section("server")
-	AppName = rootCfg.Section("").Key("APP_NAME").MustString("Gitea: Git with a cup of tea")
+	AppName = rootCfg.Section("").Key("APP_NAME").MustString("Forgejo: Beyond coding. We Forge.")
 
 	Domain = sec.Key("DOMAIN").MustString("localhost")
 	HTTPAddr = sec.Key("HTTP_ADDR").MustString("0.0.0.0")
diff --git a/routers/install/install.go b/routers/install/install.go
index 6d60dfdca3..cacd74479f 100644
--- a/routers/install/install.go
+++ b/routers/install/install.go
@@ -181,7 +181,7 @@ func checkDatabase(ctx *context.Context, form *forms.InstallForm) bool {
 	if err = db.InitEngine(ctx); err != nil {
 		if strings.Contains(err.Error(), `Unknown database type: sqlite3`) {
 			ctx.Data["Err_DbType"] = true
-			ctx.RenderWithErr(ctx.Tr("install.sqlite3_not_available", "https://docs.gitea.com/installation/install-from-binary"), tplInstall, form)
+			ctx.RenderWithErr(ctx.Tr("install.sqlite3_not_available", "https://forgejo.org/download#installation-from-binary"), tplInstall, form)
 		} else {
 			ctx.Data["Err_DbSetting"] = true
 			ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), tplInstall, form)
diff --git a/web_src/js/features/install.js b/web_src/js/features/install.js
index 23122ca4c3..32381a7b37 100644
--- a/web_src/js/features/install.js
+++ b/web_src/js/features/install.js
@@ -14,8 +14,8 @@ export function initInstall() {
 }
 
 function initPreInstall() {
-  const defaultDbUser = 'gitea';
-  const defaultDbName = 'gitea';
+  const defaultDbUser = 'forgejo';
+  const defaultDbName = 'forgejo';
 
   const defaultDbHosts = {
     mysql: '127.0.0.1:3306',

From 4fc629b0d4c9fbc3f5933e4d5111dc67af59b393 Mon Sep 17 00:00:00 2001
From: Caesar Schinas <caesar@caesarschinas.com>
Date: Sun, 25 Dec 2022 02:35:04 -1000
Subject: [PATCH 06/36] [BRANDING] Custom loading animation for Forgejo

(cherry picked from commit a3b3b8a2dfb31f3b8000f1bfeae63ef3190c211f)
(cherry picked from commit de0fd2d2e459aec24dae1293cc1f8f04069dedac)
(cherry picked from commit e1bf4de211a92a2f4645b3f34039749456a10ea3)
(cherry picked from commit 60ffc88a47a158fe4920f05875ea8d156eecaa70)
(cherry picked from commit 7d2beea9ca4b47a29a1737b3a4d1d5486f2db1d3)
(cherry picked from commit 171eadb95225183b3c1a1dfd3a5181953868b7d2)
(cherry picked from commit 5e81f75ed2541fafb72d20911fa1db01154f8ff9)

Conflicts:
	templates/install.tmpl
	templates/post-install.tmpl
	templates/repo/migrate/migrating.tmpl
(cherry picked from commit 641c4a36c5c576d92d3dca952130542496c8c07f)
(cherry picked from commit f1dbb2dcff94bcd734309c55808470d29f497577)
(cherry picked from commit b66de5e5316b09eeaf6c3463542994293f7b2995)
(cherry picked from commit eeccdf21a11e13f796caa45c206c89d9c273bc6b)
(cherry picked from commit af37663f4d12aec35ee42769468e1e733a8bd4a0)
(cherry picked from commit ed3739dccbfdacb6e0c8408ff6a26fcac20f8eb4)
(cherry picked from commit f0036e37cf4f6e4402e2fbbe42763553399b51a8)
(cherry picked from commit 90d453898a5c6481b9b2b6fe356f0a7b3ad2eafc)
(cherry picked from commit c01154323832c57af7a84cadc4580a00bcc96e5e)
(cherry picked from commit a294f34165c4df7100589dd2b44baf60af9d14b3)
(cherry picked from commit cc00759140bc6bf3f68129ab97995c3bf01db276)
(cherry picked from commit abe6d83b85759a80d82d52faacd36e8f315d5777)
(cherry picked from commit 274d2863398cbb94f075a7532152eb9a090b504d)
(cherry picked from commit 594aaf3c95e9cf671d02a81195653e0dabb1cae9)
(cherry picked from commit 6059a376f48d96dccfaf99ff1eede2d4ba38afc5)
(cherry picked from commit 676eb49a123694beba3bed8c0f00608f80b6b03b)
(cherry picked from commit fc834fdb86e3678c3092d0e64be6ca2e0adb3a54)
(cherry picked from commit e1e89a43495612c4e9a2e57c717c2996f1ad8cce)
(cherry picked from commit 89e0d29cdb9ca413e0e31062997b9276482e5294)
(cherry picked from commit eb7fc7a27eaf7e32d53228b660dfb98049f89b4d)
(cherry picked from commit caa41ff62928df3b032234a945277bddb3c70f4f)
(cherry picked from commit a74b6adb6ae77332638fcc8325072e82ae7f0a2c)
---
 public/assets/img/failed.png          | Bin 11009 -> 0 bytes
 public/assets/img/forgejo-loading.svg |  14 ++++++++++++++
 public/assets/img/loading.png         | Bin 12629 -> 0 bytes
 templates/install.tmpl                |   2 +-
 templates/post-install.tmpl           |   2 +-
 templates/repo/migrate/migrating.tmpl |   4 ++--
 6 files changed, 18 insertions(+), 4 deletions(-)
 delete mode 100644 public/assets/img/failed.png
 create mode 100644 public/assets/img/forgejo-loading.svg
 delete mode 100644 public/assets/img/loading.png

diff --git a/public/assets/img/failed.png b/public/assets/img/failed.png
deleted file mode 100644
index b37545f90ca3b304357516661efb9e1431fa96aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11009
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

diff --git a/public/assets/img/forgejo-loading.svg b/public/assets/img/forgejo-loading.svg
new file mode 100644
index 0000000000..919552ebb5
--- /dev/null
+++ b/public/assets/img/forgejo-loading.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 212 212">
+  <style>
+    @keyframes draw-orange{0%{stroke-dashoffset:200}25%{stroke-dashoffset:200;stroke-width:0}50%{stroke-dashoffset:0;stroke-width:25}to{stroke-dashoffset:0}}@keyframes draw-red{0%{stroke-dashoffset:130;stroke-width:0}25%{stroke-dashoffset:0;stroke-width:25}50%,to{stroke-dashoffset:0}}@keyframes red-circle{0%{opacity:0}20%{opacity:0;stroke-width:0}25%{opacity:1;stroke-width:15}to{opacity:1}}@keyframes orange-circle{0%{opacity:0}45%{opacity:0;stroke-width:0}50%{opacity:1;stroke-width:15}to{opacity:1}}@keyframes fade{0%,90%{opacity:1}to{opacity:0}}circle,path{fill:none;stroke:#000;stroke-width:15}path{stroke-width:25}.orange{stroke:#f60}.red{stroke:#d40000}
+  </style>
+  <g transform="translate(6 6)">
+    <g style="animation:fade 2000ms ease-in-out 5ms infinite">
+      <path d="M58 168V70a50 50 0 0 1 50-50h20" class="orange" style="stroke-dasharray:200;stroke-dashoffset:200;animation:draw-orange 2000ms ease-out 5ms infinite"/>
+      <path d="M58 168v-30a50 50 0 0 1 50-50h20" class="red" style="stroke-dasharray:130;stroke-dashoffset:130;animation:draw-red 2000ms ease-out 5ms infinite"/>
+      <circle cx="142" cy="20" r="18" class="orange" style="opacity:0;animation:orange-circle 2000ms ease-out 5ms infinite"/>
+      <circle cx="142" cy="88" r="18" class="red" style="opacity:0;animation:red-circle 2000ms ease-out 5ms infinite"/>
+    </g>
+    <circle cx="58" cy="180" r="18" class="red"/>
+  </g>
+</svg>
diff --git a/public/assets/img/loading.png b/public/assets/img/loading.png
deleted file mode 100644
index c5ba3d9cd79960a3990d5c61fa68c98c632a1a50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12629
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
CkrlrH

diff --git a/templates/install.tmpl b/templates/install.tmpl
index c8e094b5a3..ac2ba8ec18 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -347,5 +347,5 @@
 		</div>
 	</div>
 </div>
-<img class="gt-hidden" src="{{AssetUrlPrefix}}/img/loading.png">
+<img class="gt-hidden" src="{{AssetUrlPrefix}}/img/forgejo-loading.svg" width="256" height="256">
 {{template "base/footer" .}}
diff --git a/templates/post-install.tmpl b/templates/post-install.tmpl
index 5048b910d8..d907fa1f87 100644
--- a/templates/post-install.tmpl
+++ b/templates/post-install.tmpl
@@ -7,7 +7,7 @@
 					<div class="ui stackable middle very relaxed page grid">
 						<div class="sixteen wide center aligned centered column">
 							<div>
-								<img src="{{AssetUrlPrefix}}/img/loading.png" alt="{{.locale.Tr "loading"}}">
+								<img src="{{AssetUrlPrefix}}/img/forgejo-loading.svg" alt="{{.locale.Tr "loading"}}" width="256" height="256">
 							</div>
 						</div>
 					</div>
diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl
index d1bdc5a90f..1859bd2fc6 100644
--- a/templates/repo/migrate/migrating.tmpl
+++ b/templates/repo/migrate/migrating.tmpl
@@ -9,12 +9,12 @@
 					<div class="ui stackable middle very relaxed page grid">
 						<div id="repo_migrating" class="sixteen wide center aligned centered column" data-migrating-task-id="{{.MigrateTask.ID}}">
 							<div>
-								<img src="{{AssetUrlPrefix}}/img/loading.png">
+								<img src="{{AssetUrlPrefix}}/img/forgejo-loading.svg" width="256" height="256">
 							</div>
 						</div>
 						<div id="repo_migrating_failed_image" class="sixteen wide center aligned centered column gt-hidden">
 							<div>
-								<img src="{{AssetUrlPrefix}}/img/failed.png">
+								<span class="red">{{svg "octicon-git-pull-request-closed" 256 "ui red icon"}}</span>
 							</div>
 						</div>
 					</div>

From e3beb523007fe87951a4e901596aaef965de0771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Dachary?= <loic@dachary.org>
Date: Sun, 25 Dec 2022 16:25:25 +0100
Subject: [PATCH 07/36] [BRANDING] container images: set APP_NAME

(cherry picked from commit 12d7bc447edb272327200389c73bb04bb5fccc14)
(cherry picked from commit 1335b17fc35b8b873b94435fddcc23c5cdf0117e)
(cherry picked from commit 0d7da06c47ac3a7278602871b95234f823e11f1d)
(cherry picked from commit 095c1ab679bce39dbaa89e8a86eaeab8a9b823ad)
(cherry picked from commit 2220f00d09e2692d10e0d07f1e8ae2232a636a7d)
(cherry picked from commit f0be8bbdbfb758fd13f2f9325358ad292f6c030c)
(cherry picked from commit 15188180a15adb58bbde418018612561b68b6927)
(cherry picked from commit 96c471d7d36a24824835b254bf785689f898d715)
(cherry picked from commit 709052f1e79bbb0ee417f8001c9c0dbd03e78791)
(cherry picked from commit 98cd2f5deee05ae9be67250c85fc17e31eaaf28a)
(cherry picked from commit a1014654b13e338eaf35cd96d6115fe88459480f)
(cherry picked from commit a16f4dc51dce3f9d22cf899186fc61931a82f35e)
(cherry picked from commit abbed33d1699daa99620acdec5322846f562cb8d)
(cherry picked from commit 4871447def0794027227280059bdfa29cacc0a23)
(cherry picked from commit ea1218b237017fa3ca3e5204afd56a18e8336650)
(cherry picked from commit 6dd67d60de567e70a36524db940b8e88420251c0)
(cherry picked from commit 71761f04afff6d1552c5604fcf7f9b5a27cf01ba)
(cherry picked from commit 7cb28a3a06b1b665a6ac9d2687c79ef5ceed0dba)
(cherry picked from commit d116336cb5a2df68260fbec42b606fa35c27ba30)
(cherry picked from commit 4138a698b2744f504cc6e3590ab8b14753cb719d)
(cherry picked from commit 38c572bc1928fc138503a88b66aa8e6d1c06aa6e)
(cherry picked from commit 94c759b47f93dde23473d45eff2309dce5055d8a)
(cherry picked from commit e1f52bf1d5087df6c7905afc08a7cbada6854f7f)
(cherry picked from commit 8bc7000cfa7d0caa87f99c07543f36925fbe984b)
(cherry picked from commit fa60007c3464a8d7fc278df1f6d51fb40c6ed130)
(cherry picked from commit 0328db39c9a9359046aea0a422002a3072509345)
(cherry picked from commit d028010b64e9d12dc3698fadd8b6f017ea2762ef)
(cherry picked from commit 0283c920f01e8ec599613f8e28fa39157f698e4c)
(cherry picked from commit f5bdf3e11f93c508d03ce38d66550aadeb41abdd)
---
 docker/root/etc/s6/gitea/setup                | 2 +-
 docker/rootless/usr/local/bin/docker-setup.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/root/etc/s6/gitea/setup b/docker/root/etc/s6/gitea/setup
index b801ef4e03..f8d76273c7 100755
--- a/docker/root/etc/s6/gitea/setup
+++ b/docker/root/etc/s6/gitea/setup
@@ -32,7 +32,7 @@ if [ ! -f ${GITEA_CUSTOM}/conf/app.ini ]; then
     fi
 
     # Substitute the environment variables in the template
-    APP_NAME=${APP_NAME:-"Gitea: Git with a cup of tea"} \
+    APP_NAME=${APP_NAME:-"Forgejo: Beyond coding. We forge."} \
     RUN_MODE=${RUN_MODE:-"prod"} \
     DOMAIN=${DOMAIN:-"localhost"} \
     SSH_DOMAIN=${SSH_DOMAIN:-"localhost"} \
diff --git a/docker/rootless/usr/local/bin/docker-setup.sh b/docker/rootless/usr/local/bin/docker-setup.sh
index feab02a379..b480685863 100755
--- a/docker/rootless/usr/local/bin/docker-setup.sh
+++ b/docker/rootless/usr/local/bin/docker-setup.sh
@@ -26,7 +26,7 @@ if [ ! -f ${GITEA_APP_INI} ]; then
     fi
 
     # Substitute the environment variables in the template
-    APP_NAME=${APP_NAME:-"Gitea: Git with a cup of tea"} \
+    APP_NAME=${APP_NAME:-"Forgejo: Beyond coding. We forge."} \
     RUN_MODE=${RUN_MODE:-"prod"} \
     RUN_USER=${USER:-"git"} \
     SSH_DOMAIN=${SSH_DOMAIN:-"localhost"} \

From 58f11e7310dfec6fc6f195aa36e465c846a431c5 Mon Sep 17 00:00:00 2001
From: Caesar Schinas <caesar@caesarschinas.com>
Date: Sun, 25 Dec 2022 01:44:04 -1000
Subject: [PATCH 08/36] [BRANDING] Add Forgejo light, dark, and auto themes

(cherry picked from commit faab0c670e22588bc643d71b650560c2ccca2c8e)
(cherry picked from commit b6d59493c7fa0bfa62095abb99c5c5a29bcf1659)
(cherry picked from commit 837da0c1f41b40853eb4aebc40af16433cf7a9c2)
(cherry picked from commit 71ad245e1d6f7f5b002c1c5e9831e872d157f906)
(cherry picked from commit 85a7032f1b1c0d80e3d3960e9d902e9e66e687a5)

Conflicts:
	web_src/css/themes/theme-forgejo-auto.less
	web_src/css/themes/theme-forgejo-dark.less
	web_src/css/themes/theme-forgejo-light.less
	web_src/less/_home.less
        see https://codeberg.org/forgejo/forgejo/pulls/552
(cherry picked from commit 0c2c131bb06024fca7d5c8ef6a2696d5f6aa4a1b)

[BRANDING] Add Forgejo light, dark, and auto themes: fix import

Closes: https://codeberg.org/forgejo/forgejo/issues/562
(cherry picked from commit 2b0dc1f80ff18d1c94df74c77a80e3651e7cb2ed)
(cherry picked from commit 494ad6a3b7cd3328c835e6c7c76a55a77d47a60d)
(cherry picked from commit 6940fc22c4917e86b25cf3c6c2ead9057ae726d4)
(cherry picked from commit bd6f00656c457339ef3d08612911594358a15f14)
(cherry picked from commit ebb506a1247751b1182348b281089dc00a65c741)
(cherry picked from commit 43d72d37811c8b9d00b1d046341401643f66b289)
(cherry picked from commit 1a87adca018545f6d2db0dad9e5d7cb59f6a97b8)
(cherry picked from commit 0704c410b4e8a0b610e82f6ebe9209fb485ee722)
(cherry picked from commit 9039b47c160e7fce2bd75167a0358eb7e7458e2d)
(cherry picked from commit e32bb7892481a80156163dbf5063da0c8ead27d4)
(cherry picked from commit 053ad84f91f994f96f4d9d037ff37e25b468c424)
(cherry picked from commit a35f1b6da7a061a3d0717548d8f4e0972e7bb0ec)
(cherry picked from commit 8cb94c01d5bcd453938924ce6c6a6804ce9ec255)

[BRANDING] fix invisible label in branch protection settings

(cherry picked from commit 23e5d457219a68f49938395b5532231ce4ac0022)
(cherry picked from commit f02e4582e51a6a2eba93ddd599b7ea3679388e55)

[BRANDING] Fix commit label for Forgejo Dark theme (#843)

- Define the `--color-label-text` variable with a light color, which is currently used for commit's SHA

Co-authored-by: Gusted <postmaster@gusted.xyz>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/843
(cherry picked from commit 74c186a3806e37fcca8087ad79ba7c1f8e0d559e)
(cherry picked from commit 7e185c5ca5298fad12fcc78b504d96163e71ad71)

[BRANDING] Add Forgejo light, dark, and auto themes (squash) variables

Adapt to b6bcb79987ae3c9095fe2b2c7c0a3e4b42cdebba Improve notification
icon and navbar

Refs: https://codeberg.org/forgejo/forgejo/issues/893

[BRANDING] Add Forgejo light variables

Updates the Forgejo light theme with the changes in b6bcb7998

These are the same changes as made in 2574dbcff to the dark theme

Refs: forgejo/forgejo#893
(cherry picked from commit 9e99fe4f9ec79aebbf34490e12b0acf3097dd5c7)
(cherry picked from commit acbb98bd912fc3a28d464eaef1d756f54fd87e8e)
(cherry picked from commit c80245ed87d09067d880d6f91c3edaa35e4346de)

[BRANDING] fix code highlight color in Forgejo themes

(cherry picked from commit ffc49a4e992162a480d5056e1211fc7496e4aa06)
(cherry picked from commit c5f45a941e3dd8882164a88b2653407fedf6dea0)
(cherry picked from commit eee5427c9d581b8e2cd254d4a15508200622aef0)
(cherry picked from commit 89be50ca27a7ad33f109bbc3549220b37875206a)
(cherry picked from commit 74e4776ef504870d9831818ee141b12afd5f46ab)
(cherry picked from commit 6c4e07a6a718c375ee2d3975ea7bb01d382d1d90)

[BRANDING] more accessible text selection color in Forgejo themes

(cherry picked from commit 7407605ffdedef8fa320477a3bd7efa06df263e2)
(cherry picked from commit 5aab3872cc5bd267bc16bfbcedef66fd03616488)
(cherry picked from commit 1ec77d8bd00bc6914d0926d98d503debe41cc6fd)
(cherry picked from commit 964c89fce7bb5b4be06d4cd1cac247426061ec2e)
(cherry picked from commit 8a8023a4414e27d28f4503e2d2fb12afc4b7aac6)
(cherry picked from commit 1c9ffeadf5ce419d576afc89faff9fdd6c1b5478)

[BRANDING] Fix navigation hover color (squash)

- For items in the navigation bar, use different background colours for hover.
- Regression since https://github.com/go-gitea/gitea/pull/25343

(cherry picked from commit 8f3f4b219c449011a810c6a9f946fe216d841778)
(cherry picked from commit edfb0eef06e798009389b12b2c0a417c4c845887)
(cherry picked from commit a6367fa48a2d10465b5d00aa6fb3db886f3c238f)
(cherry picked from commit d5697abe4257390a687102d0964fee15f9214b73)
(cherry picked from commit eaf537091997650d9370457b7eb53205a552d267)
---
 modules/setting/ui.go                      |   4 +-
 web_src/css/home.css                       |   4 +-
 web_src/css/themes/theme-forgejo-auto.css  |   2 +
 web_src/css/themes/theme-forgejo-dark.css  | 285 +++++++++++++++++++++
 web_src/css/themes/theme-forgejo-light.css | 255 ++++++++++++++++++
 5 files changed, 546 insertions(+), 4 deletions(-)
 create mode 100644 web_src/css/themes/theme-forgejo-auto.css
 create mode 100644 web_src/css/themes/theme-forgejo-dark.css
 create mode 100644 web_src/css/themes/theme-forgejo-light.css

diff --git a/modules/setting/ui.go b/modules/setting/ui.go
index 4116da1166..c095606f3a 100644
--- a/modules/setting/ui.go
+++ b/modules/setting/ui.go
@@ -76,8 +76,8 @@ var UI = struct {
 	CodeCommentLines:    4,
 	ReactionMaxUserNum:  10,
 	MaxDisplayFileSize:  8388608,
-	DefaultTheme:        `auto`,
-	Themes:              []string{`auto`, `gitea`, `arc-green`},
+	DefaultTheme:        `forgejo-auto`,
+	Themes:              []string{`forgejo-auto`, `forgejo-light`, `forgejo-dark`, `auto`, `gitea`, `arc-green`},
 	Reactions:           []string{`+1`, `-1`, `laugh`, `hooray`, `confused`, `heart`, `rocket`, `eyes`},
 	CustomEmojis:        []string{`git`, `gitea`, `codeberg`, `gitlab`, `github`, `gogs`, `forgejo`},
 	CustomEmojisMap:     map[string]string{"git": ":git:", "gitea": ":gitea:", "codeberg": ":codeberg:", "gitlab": ":gitlab:", "github": ":github:", "gogs": ":gogs:", "forgejo": ":forgejo:"},
diff --git a/web_src/css/home.css b/web_src/css/home.css
index 28992ef31f..22f1a2dc98 100644
--- a/web_src/css/home.css
+++ b/web_src/css/home.css
@@ -21,7 +21,7 @@
 }
 
 .home .hero .svg {
-  color: var(--color-green);
+  color: var(--color-primary);
   height: 40px;
   width: 50px;
   vertical-align: bottom;
@@ -40,7 +40,7 @@
 }
 
 .home a {
-  color: var(--color-green);
+  color: var(--color-primary);
 }
 
 .page-footer {
diff --git a/web_src/css/themes/theme-forgejo-auto.css b/web_src/css/themes/theme-forgejo-auto.css
new file mode 100644
index 0000000000..ebf59942ea
--- /dev/null
+++ b/web_src/css/themes/theme-forgejo-auto.css
@@ -0,0 +1,2 @@
+@import "theme-forgejo-light.css";
+@import "theme-forgejo-dark.css" (prefers-color-scheme: dark);
diff --git a/web_src/css/themes/theme-forgejo-dark.css b/web_src/css/themes/theme-forgejo-dark.css
new file mode 100644
index 0000000000..e3b031ed2e
--- /dev/null
+++ b/web_src/css/themes/theme-forgejo-dark.css
@@ -0,0 +1,285 @@
+@import "../chroma/dark.css";
+@import "../codemirror/dark.css";
+:root {
+  --steel-900: #10161D;
+  --steel-850: #131A21;
+  --steel-800: #171E26;
+  --steel-750: #1D262F;
+  --steel-700: #242D38;
+  --steel-650: #2B3642;
+  --steel-600: #374351;
+  --steel-550: #445161;
+  --steel-500: #515F70;
+  --steel-450: #5F6E80;
+  --steel-400: #6D7D8F;
+  --steel-350: #7C8C9F;
+  --steel-300: #8C9CAF;
+  --steel-250: #9DADC0;
+  --steel-200: #AEBED0;
+  --steel-150: #C0CFE0;
+  --steel-100: #D2E0F0;
+  --is-dark-theme: true;
+  --color-primary: #fb923c;
+  --color-primary-contrast: #000;
+  --color-primary-dark-1: #fdba74;
+  --color-primary-dark-2: #fdba74;
+  --color-primary-dark-3: #fed7aa;
+  --color-primary-dark-4: #fed7aa;
+  --color-primary-dark-5: #ffedd5;
+  --color-primary-dark-6: #ffedd5;
+  --color-primary-dark-7: #fff7ed;
+  --color-primary-light-1: #f97316;
+  --color-primary-light-2: #ea580c;
+  --color-primary-light-3: #c2410c;
+  --color-primary-light-4: #9a3412;
+  --color-primary-light-5: #9a3412;
+  --color-primary-light-6: #7c2d12;
+  --color-primary-light-7: #7c2d12;
+  --color-primary-alpha-10: #ea580c19;
+  --color-primary-alpha-20: #ea580c33;
+  --color-primary-alpha-30: #ea580c4b;
+  --color-primary-alpha-40: #ea580c66;
+  --color-primary-alpha-50: #ea580c80;
+  --color-primary-alpha-60: #ea580c99;
+  --color-primary-alpha-70: #ea580cb3;
+  --color-primary-alpha-80: #ea580ccc;
+  --color-primary-alpha-90: #ea580ce1;
+  --color-secondary: var(--steel-700);
+  --color-secondary-dark-1: var(--steel-550);
+  --color-secondary-dark-2: var(--steel-500);
+  --color-secondary-dark-3: var(--steel-450);
+  --color-secondary-dark-4: var(--steel-400);
+  --color-secondary-dark-5: var(--steel-350);
+  --color-secondary-dark-6: var(--steel-300);
+  --color-secondary-dark-7: var(--steel-250);
+  --color-secondary-dark-8: var(--steel-200);
+  --color-secondary-dark-9: var(--steel-150);
+  --color-secondary-dark-10: var(--steel-100);
+  --color-secondary-dark-11: var(--steel-100);
+  --color-secondary-dark-12: var(--steel-100);
+  --color-secondary-dark-13: var(--steel-100);
+  --color-secondary-light-1: var(--steel-650);
+  --color-secondary-light-2: var(--steel-700);
+  --color-secondary-light-3: var(--steel-750);
+  --color-secondary-light-4: var(--steel-800);
+  --color-secondary-alpha-10: #2B364219;
+  --color-secondary-alpha-20: #2B364233;
+  --color-secondary-alpha-30: #2B36424b;
+  --color-secondary-alpha-40: #2B364266;
+  --color-secondary-alpha-50: #2B364280;
+  --color-secondary-alpha-60: #2B364299;
+  --color-secondary-alpha-70: #2B3642b3;
+  --color-secondary-alpha-80: #2B3642cc;
+  --color-secondary-alpha-90: #2B3642e1;
+  /* colors */
+  --color-red: #b91c1c;
+  --color-orange: #ea580c;
+  --color-yellow: #ca8a04;
+  --color-olive: #91a313;
+  --color-green: #15803d;
+  --color-teal: #0d9488;
+  --color-blue: #2563eb;
+  --color-violet: #7c3aed;
+  --color-purple: #9333ea;
+  --color-pink: #db2777;
+  --color-brown: #a47252;
+  --color-grey: var(--steel-500);
+  --color-black: #111827;
+  /* light variants */
+  --color-red-light: #dc2626;
+  --color-orange-light: #f97316;
+  --color-yellow-light: #eab308;
+  --color-olive-light: #839311;
+  --color-green-light: #16a34a;
+  --color-teal-light: #14b8a6;
+  --color-blue-light: #3b82f6;
+  --color-violet-light: #8b5cf6;
+  --color-purple-light: #a855f7;
+  --color-pink-light: #ec4899;
+  --color-brown-light: #94674a;
+  --color-grey-light: var(--steel-300);
+  --color-black-light: #1f2937;
+  /* other colors */
+  --color-gold: #b1983b;
+  --color-white: #ffffff;
+  --color-diff-removed-word-bg: #783030;
+  --color-diff-added-word-bg: #255C39;
+  --color-diff-removed-row-bg: #432121;
+  --color-diff-moved-row-bg: #825718;
+  --color-diff-added-row-bg: #1B3625;
+  --color-diff-removed-row-border: #783030;
+  --color-diff-moved-row-border: #A67A1D;
+  --color-diff-added-row-border: #255C39;
+  --color-diff-inactive: var(--steel-650);
+  --color-error-border: #783030;
+  --color-error-bg: #5F2525;
+  --color-error-bg-active: #783030;
+  --color-error-bg-hover: #783030;
+  --color-error-text: #fef2f2;
+  --color-success-border: #1F6E3C;
+  --color-success-bg: #1D462C;
+  --color-success-text: #f0fdf4;
+  --color-warning-border: #A67A1D;
+  --color-warning-bg: #644821;
+  --color-warning-text: #fefce8;
+  --color-info-border: #2E50B0;
+  --color-info-bg: #2A396B;
+  --color-info-text: var(--steel-100);
+  --color-red-badge: #B91C1C;
+  --color-red-badge-bg: #B91C1C22;
+  --color-red-badge-hover-bg: #B91C1C44;
+  --color-green-badge: #16a34a;
+  --color-green-badge-bg: #16a34a22;
+  --color-green-badge-hover-bg: #16a34a44;
+  --color-yellow-badge: #ca8a04;
+  --color-yellow-badge-bg: #ca8a0422;
+  --color-yellow-badge-hover-bg: #ca8a0444;
+  --color-orange-badge: #ea580c;
+  --color-orange-badge-bg: #ea580c22;
+  --color-orange-badge-hover-bg: #ea580c44;
+  --color-git: #f05133;
+  /* target-based colors */
+  --color-body: var(--steel-800);
+  --color-box-header: var(--steel-700);
+  --color-box-body: var(--steel-750);
+  --color-box-body-highlight: var(--steel-650);
+  --color-text-dark: #fff;
+  --color-text: var(--steel-100);
+  --color-text-light: var(--steel-150);
+  --color-text-light-1: var(--steel-150);
+  --color-text-light-2: var(--steel-200);
+  --color-text-light-3: var(--steel-200);
+  --color-footer: var(--steel-900);
+  --color-timeline: var(--steel-650);
+  --color-input-text: var(--steel-100);
+  --color-input-background: var(--steel-650);
+  --color-input-toggle-background: var(--steel-650);
+  --color-input-border: var(--steel-550);
+  --color-input-border-hover: var(--steel-450);
+  --color-header-wrapper: var(--steel-850);
+  --color-header-wrapper-transparent: #242D3800;
+  --color-light: #00000028;
+  --color-light-mimic-enabled: rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled)));
+  --color-light-border: #ffffff28;
+  --color-hover: var(--steel-600);
+  --color-active: var(--steel-650);
+  --color-menu: var(--steel-700);
+  --color-card: var(--steel-700);
+  --color-markup-table-row: #ffffff06;
+  --color-markup-code-block: var(--steel-800);
+  --color-button: var(--steel-600);
+  --color-code-bg: var(--steel-750);
+  --color-code-sidebar-bg: var(--steel-600);
+  --color-shadow: #00000060;
+  --color-secondary-bg: var(--steel-700);
+  --color-text-focus: #fff;
+  --color-expand-button: #3c404d;
+  --color-placeholder-text: var(--steel-450);
+  --color-editor-line-highlight: var(--steel-700);
+  --color-project-board-bg: var(--color-secondary-light-3);
+  --color-project-board-dark-label: var(--color-text-light-3);
+  --color-caret: var(--color-text);
+  /* should ideally be --color-text-dark, see #15651 */
+  --color-reaction-bg: #ffffff12;
+  --color-reaction-active-bg: var(--color-primary-alpha-30);
+  --color-nav-bg: var(--steel-900);
+  --color-nav-hover-bg: var(--steel-600);
+  --color-label-active-bg: #4c525e;
+  --color-label-text: #fff;
+  --color-accent: var(--color-primary-light-1);
+  --color-small-accent: var(--color-primary-light-5);
+  --color-active-line: var(--color-primary-alpha-20);
+  accent-color: var(--color-accent);
+  color-scheme: dark;
+}
+/* invert emojis that are hard to read otherwise */
+.emoji[aria-label="check mark"],
+.emoji[aria-label="currency exchange"],
+.emoji[aria-label="TOP arrow"],
+.emoji[aria-label="END arrow"],
+.emoji[aria-label="ON! arrow"],
+.emoji[aria-label="SOON arrow"],
+.emoji[aria-label="heavy dollar sign"],
+.emoji[aria-label="copyright"],
+.emoji[aria-label="registered"],
+.emoji[aria-label="trade mark"],
+.emoji[aria-label="multiply"],
+.emoji[aria-label="plus"],
+.emoji[aria-label="minus"],
+.emoji[aria-label="divide"],
+.emoji[aria-label="curly loop"],
+.emoji[aria-label="double curly loop"],
+.emoji[aria-label="wavy dash"],
+.emoji[aria-label="paw prints"],
+.emoji[aria-label="musical note"],
+.emoji[aria-label="musical notes"] {
+  filter: invert(100%) hue-rotate(180deg);
+}
+.following.bar.light {
+  border-bottom-color: #ffffff11 !important;
+}
+.text.green.svg {
+  color: #16a34a !important;
+}
+i.grey.icon.icon.icon.icon {
+  color: var(--steel-350) !important;
+}
+.ui.red.button,
+.ui.negative.button {
+  background-color: #7f1d1d !important;
+  color: #fff !important;
+  border-color: var(--color-light-border) !important;
+}
+.ui.red.button:hover,
+.ui.negative.button:hover {
+  background-color: #991b1b !important;
+}
+.ui.secondary.vertical.menu {
+  border-radius: 0.28571429rem !important;
+  overflow: hidden;
+}
+.ui.secondary.vertical.menu > .item {
+  border-radius: 0 !important;
+}
+.ui.basic.primary.button.item {
+  background-color: var(--color-active) !important;
+  color: var(--color-text) !important;
+  box-shadow: none !important;
+}
+.ui.red.label.notification_count,
+.ui.primary.label,
+.ui.primary.labels .label {
+  background-color: var(--color-primary-light-3) !important;
+}
+.repository.view.issue .comment-list .code-comment + .code-comment {
+  margin: 1.25rem 0 !important;
+  padding-top: 1.25rem !important;
+  border-top-color: var(--steel-650) !important;
+}
+.ui.labeled.icon.buttons > .button > .icon,
+.ui.labeled.icon.button > .icon {
+  background-color: rgba(0, 0, 0, 0.05) !important;
+}
+#review-box .review-comments-counter {
+  background-color: #00000088 !important;
+  color: #fff !important;
+  margin-left: 0.5em;
+}
+.ui.tabs .ui.primary.label,
+.ui.menu .ui.primary.label {
+  background-color: rgba(192, 192, 255, 0.2) !important;
+  color: var(--color-text-dark) !important;
+}
+.ui.basic.yellow.label.pending-label {
+  background: var(--color-light) !important;
+}
+.ui.tertiary.button {
+  color: #fff9;
+}
+.ui.tertiary.button:hover {
+  color: #ccc;
+}
+::selection {
+  background: var(--steel-100) !important;
+  color: #000 !important;
+}
diff --git a/web_src/css/themes/theme-forgejo-light.css b/web_src/css/themes/theme-forgejo-light.css
new file mode 100644
index 0000000000..7fc09a7994
--- /dev/null
+++ b/web_src/css/themes/theme-forgejo-light.css
@@ -0,0 +1,255 @@
+:root {
+  --steel-900: #10161D;
+  --steel-850: #131A21;
+  --steel-800: #171E26;
+  --steel-750: #1D262F;
+  --steel-700: #242D38;
+  --steel-650: #2B3642;
+  --steel-600: #374351;
+  --steel-550: #445161;
+  --steel-500: #515F70;
+  --steel-450: #5F6E80;
+  --steel-400: #6D7D8F;
+  --steel-350: #7C8C9F;
+  --steel-300: #8C9CAF;
+  --steel-250: #9DADC0;
+  --steel-200: #AEBED0;
+  --steel-150: #C0CFE0;
+  --steel-100: #D2E0F0;
+  --zinc-50: #FAFAFA;
+  --zinc-100: #F4F4F5;
+  --zinc-150: #ECECEE;
+  --zinc-200: #E4E4E7;
+  --zinc-250: #DCDCE0;
+  --zinc-300: #D4D4D8;
+  --zinc-350: #BABAC1;
+  --zinc-400: #A1A1AA;
+  --zinc-450: #898992;
+  --zinc-500: #71717A;
+  --zinc-550: #61616A;
+  --zinc-600: #52525B;
+  --zinc-650: #484850;
+  --zinc-700: #3F3F46;
+  --zinc-750: #333338;
+  --zinc-800: #27272A;
+  --zinc-850: #1F1F23;
+  --zinc-900: #18181B;
+  --color-primary: #c2410c;
+  --color-primary-contrast: #ffffff;
+  --color-primary-dark-1: #c2410c;
+  --color-primary-dark-2: #9a3412;
+  --color-primary-dark-3: #9a3412;
+  --color-primary-dark-4: #7c2d12;
+  --color-primary-dark-5: #7c2d12;
+  --color-primary-dark-6: #7c2d12;
+  --color-primary-dark-7: #7c2d12;
+  --color-primary-light-1: #ea580c;
+  --color-primary-light-2: #f97316;
+  --color-primary-light-3: #fb923c;
+  --color-primary-light-4: #fdba74;
+  --color-primary-light-5: #fed7aa;
+  --color-primary-light-6: #ffedd5;
+  --color-primary-light-7: #fff7ed;
+  --color-primary-alpha-10: #c2410c19;
+  --color-primary-alpha-20: #c2410c33;
+  --color-primary-alpha-30: #c2410c4b;
+  --color-primary-alpha-40: #c2410c66;
+  --color-primary-alpha-50: #c2410c80;
+  --color-primary-alpha-60: #c2410c99;
+  --color-primary-alpha-70: #c2410cb3;
+  --color-primary-alpha-80: #c2410ccc;
+  --color-primary-alpha-90: #c2410ce1;
+  --color-secondary: var(--zinc-200);
+  --color-secondary-dark-1: var(--zinc-200);
+  --color-secondary-dark-2: var(--zinc-300);
+  --color-secondary-dark-3: var(--zinc-300);
+  --color-secondary-dark-4: var(--zinc-400);
+  --color-secondary-dark-5: var(--zinc-400);
+  --color-secondary-dark-6: var(--zinc-500);
+  --color-secondary-dark-7: var(--zinc-500);
+  --color-secondary-dark-8: var(--zinc-600);
+  --color-secondary-dark-9: var(--zinc-600);
+  --color-secondary-dark-10: var(--zinc-700);
+  --color-secondary-dark-11: var(--zinc-700);
+  --color-secondary-dark-12: var(--zinc-800);
+  --color-secondary-dark-13: var(--zinc-800);
+  --color-secondary-light-1: var(--zinc-200);
+  --color-secondary-light-2: var(--zinc-100);
+  --color-secondary-light-3: var(--zinc-100);
+  --color-secondary-light-4: var(--zinc-50);
+  --color-secondary-alpha-10: #d4d4d819;
+  --color-secondary-alpha-20: #d4d4d833;
+  --color-secondary-alpha-30: #d4d4d84b;
+  --color-secondary-alpha-40: #d4d4d866;
+  --color-secondary-alpha-50: #d4d4d880;
+  --color-secondary-alpha-60: #d4d4d899;
+  --color-secondary-alpha-70: #d4d4d8b3;
+  --color-secondary-alpha-80: #d4d4d8cc;
+  --color-secondary-alpha-90: #d4d4d8e1;
+  /* colors */
+  --color-red: #dc2626;
+  --color-orange: #ea580c;
+  --color-yellow: #ca8a04;
+  --color-olive: #91a313;
+  --color-green: #15803d;
+  --color-teal: #0d9488;
+  --color-blue: #2563eb;
+  --color-violet: #7c3aed;
+  --color-purple: #9333ea;
+  --color-pink: #db2777;
+  --color-brown: #a47252;
+  --color-grey: #4b5563;
+  --color-black: #000000;
+  /* light variants */
+  --color-red-light: #ef4444;
+  --color-orange-light: #f97316;
+  --color-yellow-light: #eab308;
+  --color-olive-light: #839311;
+  --color-green-light: #16a34a;
+  --color-teal-light: #14b8a6;
+  --color-blue-light: #3b82f6;
+  --color-violet-light: #8b5cf6;
+  --color-purple-light: #a855f7;
+  --color-pink-light: #ec4899;
+  --color-brown-light: #94674a;
+  --color-grey-light: #6b7280;
+  --color-black-light: #181818;
+  /* other colors */
+  --color-gold: #b1983b;
+  --color-white: #ffffff;
+  --color-diff-removed-word-bg: #fca5a5;
+  --color-diff-added-word-bg: #86efac;
+  --color-diff-removed-row-bg: #fee2e2;
+  --color-diff-moved-row-bg: #fef9c3;
+  --color-diff-added-row-bg: #dcfce7;
+  --color-diff-removed-row-border: #fca5a5;
+  --color-diff-moved-row-border: #fde047;
+  --color-diff-added-row-border: #86efac;
+  --color-diff-inactive: var(--zinc-100);
+  --color-error-border: #fecaca;
+  --color-error-bg: #fee2e2;
+  --color-error-bg-active: #fca5a5;
+  --color-error-bg-hover: #fecaca;
+  --color-error-text: #7f1d1d;
+  --color-success-border: #bbf7d0;
+  --color-success-bg: #dcfce7;
+  --color-success-text: #14532d;
+  --color-warning-border: #fde047;
+  --color-warning-bg: #fef3c7;
+  --color-warning-text: #78350f;
+  --color-info-border: #bae6fd;
+  --color-info-bg: #e0f2fe;
+  --color-info-text: #0c4a6e;
+  --color-red-badge: #B91C1C;
+  --color-red-badge-bg: #B91C1C22;
+  --color-red-badge-hover-bg: #B91C1C44;
+  --color-green-badge: #16a34a;
+  --color-green-badge-bg: #16a34a22;
+  --color-green-badge-hover-bg: #16a34a44;
+  --color-yellow-badge: #ca8a04;
+  --color-yellow-badge-bg: #ca8a0422;
+  --color-yellow-badge-hover-bg: #ca8a0444;
+  --color-orange-badge: #ea580c;
+  --color-orange-badge-bg: #ea580c22;
+  --color-orange-badge-hover-bg: #ea580c44;
+  --color-git: #f05133;
+  /* target-based colors */
+  --color-body: #fff;
+  --color-box-header: var(--zinc-100);
+  --color-box-body: var(--zinc-50);
+  --color-box-body-highlight: var(--zinc-200);
+  --color-text-dark: #000;
+  --color-text: var(--zinc-900);
+  --color-text-light: var(--zinc-700);
+  --color-text-light-1: var(--zinc-650);
+  --color-text-light-2: var(--zinc-600);
+  --color-text-light-3: var(--zinc-550);
+  --color-footer: var(--zinc-100);
+  --color-timeline: var(--zinc-200);
+  --color-input-text: var(--zinc-800);
+  --color-input-background: #fff;
+  --color-input-toggle-background: #fff;
+  --color-input-border: var(--zinc-300);
+  --color-input-border-hover: var(--zinc-400);
+  --color-header-wrapper: var(--zinc-50);
+  --color-header-wrapper-transparent: #D2E0F000;
+  --color-light: #ffffffcc;
+  --color-light-mimic-enabled: rgba(0, 0, 0, calc(6 / 255 * 222 / 255 / var(--opacity-disabled)));
+  --color-light-border: #0000001d;
+  --color-hover: #e4e4e4aa;
+  --color-active: #d4d4d8aa;
+  --color-menu: var(--zinc-100);
+  --color-card: var(--zinc-50);
+  --color-markup-table-row: #ffffff06;
+  --color-markup-code-block: var(--zinc-150);
+  --color-button: var(--zinc-150);
+  --color-code-bg: var(--zinc-50);
+  --color-code-sidebar-bg: var(--zinc-100);
+  --color-shadow: #00000060;
+  --color-secondary-bg: var(--zinc-100);
+  --color-text-focus: #fff;
+  --color-expand-button: var(--zinc-200);
+  --color-placeholder-text: var(--zinc-400);
+  --color-editor-line-highlight: var(--zinc-100);
+  --color-project-board-bg: var(--color-secondary-light-2);
+  --color-project-board-dark-label: var(--color-text-light-3);
+  --color-caret: var(--color-text);
+  /* should ideally be --color-text-dark, see #15651 */
+  --color-reaction-bg: #0000000a;
+  --color-reaction-active-bg: var(--color-primary-alpha-20);
+  --color-nav-bg: var(--zinc-100);
+  --color-nav-hover-bg: var(--zinc-300);
+  --color-label-active-bg: #4c525e;
+  --color-accent: var(--color-primary-light-1);
+  --color-small-accent: var(--color-primary-light-5);
+  --color-active-line: var(--color-primary-light-6);
+  accent-color: var(--color-accent);
+  color-scheme: light;
+}
+.text.green.svg {
+  color: #16a34a !important;
+}
+.ui.secondary.vertical.menu {
+  border-radius: 0.28571429rem !important;
+  overflow: hidden;
+}
+.ui.secondary.vertical.menu > .item {
+  border-radius: 0 !important;
+}
+.ui.basic.primary.button.item {
+  background-color: var(--color-active) !important;
+  color: var(--color-text) !important;
+  box-shadow: none !important;
+}
+.ui.red.label.notification_count,
+.ui.primary.labels .label {
+  background-color: var(--color-primary-dark-1) !important;
+}
+.repository.view.issue .comment-list .code-comment + .code-comment {
+  margin: 1.25rem 0 !important;
+  padding-top: 1.25rem !important;
+  border-top-color: var(--zinc-250) !important;
+}
+.ui.labeled.icon.buttons > .button > .icon,
+.ui.labeled.icon.button > .icon {
+  background-color: rgba(0, 0, 0, 0.05) !important;
+}
+#review-box .review-comments-counter {
+  background-color: #ffffffaa !important;
+  color: #000 !important;
+  margin-left: 0.5em;
+}
+.ui.tabs .ui.primary.label,
+.ui.menu .ui.primary.label {
+  background-color: rgba(0, 0, 0, 0.15) !important;
+  color: var(--color-text-dark) !important;
+}
+.ui.basic.yellow.label.pending-label {
+  background: var(--color-warning-bg) !important;
+  color: var(--color-warning-text) !important;
+  border-color: #eab308 !important;
+}
+::selection {
+  background: var(--steel-450) !important;
+  color: #fff !important;
+}

From f14f26c940abd341ae6bd8e20e93bd736e907b52 Mon Sep 17 00:00:00 2001
From: Caesar Schinas <caesar@caesarschinas.com>
Date: Wed, 28 Dec 2022 00:28:39 -1000
Subject: [PATCH 09/36] [BRANDING] Rebrand default meta tags

(cherry picked from commit b1a792b63547df1471a125c2384a9623ffae409e)
(cherry picked from commit ba71acccdb8eb4d1c87b50708fe3b03a3324dd9c)
(cherry picked from commit ef58efb8e0c48a782e01aac8d754e70b7611a2c8)
(cherry picked from commit 6a1b08241ebb862bdd39c708852e3e23c4d96c9d)
(cherry picked from commit 132c7a3a07d5a11b9b165295ef12111ce74aea70)
(cherry picked from commit a1f07975d67ceccedc808ddaf657f8e7e0da74b1)
(cherry picked from commit f3793598b24d00ca3ae80dbde4ef9909b298ca03)
(cherry picked from commit 60f38116afc60b055c6b40be8a1e94f646252bf6)
(cherry picked from commit 88884cf2833429749b9a6ec6110b4c4727304903)
(cherry picked from commit 520de41aefa6c1f5c939b2345878697094962812)
(cherry picked from commit cfd5e5b95ab081d10d4f5d6022d09db4877f51fc)
(cherry picked from commit 5cf1738f0a08d99aba2016100f3f0083b51efcf4)
(cherry picked from commit b95f9b3142089d90df93708638b2ae6c857dbc87)
(cherry picked from commit 0118fba9703a1e3f9da6c7b5c479b8b919a5f5e2)
(cherry picked from commit ef213ec79d8d0ae006bfda0b9e49d2da2be47ca3)
(cherry picked from commit f6794f694b9fb262c66f8d3958dd5145c7ef0dbb)
(cherry picked from commit 639110c03bc2d2f91fb6a5c619f1138a0522f836)
(cherry picked from commit 2be6eca1e1c8488bdc9e6ce164dbd9f3d79771ce)
(cherry picked from commit eb929d0d566b3dff8454e62ff9f2384a896fb549)
(cherry picked from commit c49dd4ed7f771e8fa1573add6cbadc193a473ead)
(cherry picked from commit 8ea074c4ddaa737c4faa83c1b4746dbd7cb84440)
(cherry picked from commit 3145df43d60593700b60409a8d5ac12e4fbbc197)
(cherry picked from commit d0df3e306a4f0a4f773c7cbc1409922fe69973aa)
(cherry picked from commit 8f4850705eb4e016ebebc738f629bcc9ce87ca61)
(cherry picked from commit 5a24d4319cf7ac2e56b9e43e4181b066d76d6d8d)
(cherry picked from commit 756c04c6c46a55852089711f7859f533b85fd042)
(cherry picked from commit ea627e79e36d0bc7514b28e6b7d5847b5bdf5922)
(cherry picked from commit c52b141902ef0be06c100f4a1285f28419e6f497)
(cherry picked from commit 49ab0c55597dc12a50be39a2bd35cb870ba8e361)
---
 modules/setting/ui.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/setting/ui.go b/modules/setting/ui.go
index c095606f3a..c8ad75856e 100644
--- a/modules/setting/ui.go
+++ b/modules/setting/ui.go
@@ -123,9 +123,9 @@ var UI = struct {
 		Description string
 		Keywords    string
 	}{
-		Author:      "Gitea - Git with a cup of tea",
-		Description: "Gitea (Git with a cup of tea) is a painless self-hosted Git service written in Go",
-		Keywords:    "go,git,self-hosted,gitea",
+		Author:      "Forgejo – Beyond coding. We forge.",
+		Description: "Forgejo is a self-hosted lightweight software forge. Easy to install and low maintenance, it just does the job.",
+		Keywords:    "git,forge,forgejo",
 	},
 }
 

From a92f044ea96bbe9c47689455a417e4f1bc3cd648 Mon Sep 17 00:00:00 2001
From: TomZ <tom@flowee.org>
Date: Mon, 9 Jan 2023 14:01:00 +0100
Subject: [PATCH 10/36] [BRANDING] cosmetic s/Gitea/Forgejo/ in logs, messages,
 etc.

As the docs of codeberg refer to the strings printed by the Forgejo
ssh servers, this is user-facing and is nice to update to the new
product name.

(cherry picked from commit 103991d73f0f78f31a5f1dae47824c2fe481bcc6)
(cherry picked from commit 2a0d3f85f199d28a4180becdebcb90af0d6f3504)
(cherry picked from commit eb2b4ce388810dc145dd90d3358d4d4373e31b80)
(cherry picked from commit 0998b51716ef5d3c25e139886aa8b7bfde703b20)

[BRANDING] forgejo log message

(cherry picked from commit d51a046ebe774236f8b902c45486dc8cbd041e0e)
(cherry picked from commit d66e1c7b6e2fbfefb976103805b18eb29b6406af)
(cherry picked from commit b5bffe4ce8a8353c9e5529350a7932d4a2d9e53e)
(cherry picked from commit 3fa776d8566c42ce31540024ce5bf5a6cb5cd4e4)
(cherry picked from commit 18d064f47214327dc5b6c55c2d02a3da53358dbc)
(cherry picked from commit c95094e355212d4baf607f3778152ceb455d4f82)
(cherry picked from commit 5784290bc46afffca9b93e0faa3bd88944e54919)
(cherry picked from commit aee336886b2606beaf8c27a2992c21aa2a574966)
(cherry picked from commit ec2f60b516b1ee11b5e7c52ecb02fdf8e5bbcaec)
(cherry picked from commit 7af742a28469d6725248d5519e69217b844ed792)
(cherry picked from commit f279e2a264ae028ab511ba61a71e00739dc5020a)
(cherry picked from commit fd38cfb14eebe34dc72b8358479e53d27fe01180)
(cherry picked from commit 64c82266183943f062016479c2d1868ccdee2cec)
(cherry picked from commit b546fb23042c6d231ce29241d1991c9cb1bf1bba)
(cherry picked from commit ad102021776a8dd407ef19cbfadc42b3ca7fabd5)
(cherry picked from commit c89cab9c2b019a592dffe4b6de29482feca1bb33)
(cherry picked from commit 9579322ec2eec40cb8f113458c1d5669f5d4b818)
(cherry picked from commit 16b44ad18de82b0429a8b0a05ed93445d1524241)
(cherry picked from commit 2571ff703b77cc8527f37f82c36e9260a80ac673)
(cherry picked from commit ad61d9ce9b93503b04deb9ecdb5f214566caf820)
(cherry picked from commit 9b2c45d4d3b1c6401a3d7d0a5544213e1486ab9e)
(cherry picked from commit ed01b79a598a0698324392dab66a2cd3d41c628c)
(cherry picked from commit d040b664279292f9f7304f96db0d172672c1e904)
(cherry picked from commit ffe0bbea48d036c26149d98856add938bb08a475)
(cherry picked from commit 4c1b2c409bb90a0c2876f3a7323cf162a7e58765)
(cherry picked from commit 3d8338ed106cb6260a4dae249ddef71489c47357)
---
 cmd/serv.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/serv.go b/cmd/serv.go
index 26fc91a3b7..55fa50cd3d 100644
--- a/cmd/serv.go
+++ b/cmd/serv.go
@@ -171,13 +171,13 @@ func runServ(c *cli.Context) error {
 		}
 		switch key.Type {
 		case asymkey_model.KeyTypeDeploy:
-			println("Hi there! You've successfully authenticated with the deploy key named " + key.Name + ", but Gitea does not provide shell access.")
+			println("Hi there! You've successfully authenticated with the deploy key named " + key.Name + ", but Forgejo does not provide shell access.")
 		case asymkey_model.KeyTypePrincipal:
-			println("Hi there! You've successfully authenticated with the principal " + key.Content + ", but Gitea does not provide shell access.")
+			println("Hi there! You've successfully authenticated with the principal " + key.Content + ", but Forgejo does not provide shell access.")
 		default:
-			println("Hi there, " + user.Name + "! You've successfully authenticated with the key named " + key.Name + ", but Gitea does not provide shell access.")
+			println("Hi there, " + user.Name + "! You've successfully authenticated with the key named " + key.Name + ", but Forgejo does not provide shell access.")
 		}
-		println("If this is unexpected, please log in with password and setup Gitea under another user.")
+		println("If this is unexpected, please log in with password and setup Forgejo under another user.")
 		return nil
 	} else if c.Bool("debug") {
 		log.Debug("SSH_ORIGINAL_COMMAND: %s", os.Getenv("SSH_ORIGINAL_COMMAND"))

From b3f31c2f7bc5b4f5ed3f7fb6e6a6649331eb179a Mon Sep 17 00:00:00 2001
From: Gusted <postmaster@gusted.xyz>
Date: Mon, 9 Jan 2023 22:28:04 +0100
Subject: [PATCH 11/36] [BRANDING] Replace branding in Swagger

- "Gitea" is automatically being determined in Swagger and cannot be
overridden, therefor we override it after `swagger generate spec` is run.
- Resolves https://codeberg.org/forgejo/forgejo/issues/226

(cherry picked from commit 0b453807656b6fbe54284d865e59880460f3d253)

[BRANDING] Change Swagger title to Forgejo API

(cherry picked from commit 79f6a70b53421be9984a9ad96ebd0d06ab5af02e)
(cherry picked from commit 6cd47afe3366a615d40655a435275d5543910065)
(cherry picked from commit a7ae2e4c09431cd7a1f18c5b87b9dd87981b538d)
(cherry picked from commit 59f837e4661233dafc202ded9ad907dbdf7e3e69)
(cherry picked from commit c1c3d1f0e63b880baa32d285d3eba6034137b45a)
(cherry picked from commit 4b088713fb0a55c2c37f734ce82f13190ca412dd)
(cherry picked from commit 3df1d2137112a95279a8c84a8601e4c137d75d4f)
(cherry picked from commit a4a5fdbde4f9ebbf5ba6ba66c8f20a89e54860de)
(cherry picked from commit 57aa9ed710a95aa51ae3824873c3766b38da7850)
(cherry picked from commit 948b49bf9449af744a1f2e1324187897ed1c0809)
(cherry picked from commit be4929ab6a802d7d748f537ab8b798e30588c1d4)
(cherry picked from commit 9ecb507457d8a6aa60713762a1a5d2995ed986e5)

Conflicts:
	templates/swagger/ui.tmpl
(cherry picked from commit 8e57e688637b9fbd3c33d3e38aed8768a2c07208)
(cherry picked from commit f0b3f621e34130c75b35c113ad509ab73118e123)
(cherry picked from commit 5b0a6d093ea5210a5ba27705b1d1636e23da8738)
(cherry picked from commit 2e0f6b5de8837a439ecadaf3434d006d7014016c)
(cherry picked from commit bb08076f5c26481d78855823c2daa1a76d3865fb)
(cherry picked from commit 5c9360e38a41a4494b1b1b247f9d57b1a0d91ef0)
(cherry picked from commit 2f277561489e1228af163fa4e5d153ceb7eec864)
(cherry picked from commit 6fce7eeb511d949249e045a995cc637d3788a1f0)
(cherry picked from commit 8d27e7bebd961468bd492c4d64e132a46d97f62b)
(cherry picked from commit fda2ee2aaedac8f394d9fc38085f768c775d2c38)
(cherry picked from commit fe0489a4d856655fdcf93c16a41995709c47f78f)
(cherry picked from commit fe9479b357d2ef0f5fd8247e8356ce7c75135b88)
(cherry picked from commit 1deadb2f35c8c0c87cd93b6f04675312b1e667bb)
(cherry picked from commit d1cb84b2f225c484755172735841e3b75abce409)
(cherry picked from commit 9de15d49f8ff0ef0803e8b3a7437a45358e924b9)
(cherry picked from commit 461fbe219c30de7e756ce2cb6dbc354417655a6f)
(cherry picked from commit f39bf3ba5b6325898968533e79fdfc5fe74c3810)
---
 Makefile                       | 2 ++
 templates/swagger/ui.tmpl      | 2 +-
 templates/swagger/v1_json.tmpl | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 78b35120cc..589dd48e1e 100644
--- a/Makefile
+++ b/Makefile
@@ -150,6 +150,7 @@ SWAGGER_SPEC_S_TMPL := s|"basePath": *"/api/v1"|"basePath": "{{AppSubUrl \| JSEs
 SWAGGER_SPEC_S_JSON := s|"basePath": *"{{AppSubUrl \| JSEscape \| Safe}}/api/v1"|"basePath": "/api/v1"|g
 SWAGGER_EXCLUDE := code.gitea.io/sdk
 SWAGGER_NEWLINE_COMMAND := -e '$$a\'
+SWAGGER_SPEC_BRANDING := s|Gitea API|Forgejo API|g
 
 TEST_MYSQL_HOST ?= mysql:3306
 TEST_MYSQL_DBNAME ?= testgitea
@@ -339,6 +340,7 @@ $(SWAGGER_SPEC): $(GO_SOURCES_NO_BINDATA)
 	$(GO) run $(SWAGGER_PACKAGE) generate spec -x "$(SWAGGER_EXCLUDE)" -o './$(SWAGGER_SPEC)'
 	$(SED_INPLACE) '$(SWAGGER_SPEC_S_TMPL)' './$(SWAGGER_SPEC)'
 	$(SED_INPLACE) $(SWAGGER_NEWLINE_COMMAND) './$(SWAGGER_SPEC)'
+	$(SED_INPLACE) '$(SWAGGER_SPEC_BRANDING)' './$(SWAGGER_SPEC)'
 
 .PHONY: swagger-check
 swagger-check: generate-swagger
diff --git a/templates/swagger/ui.tmpl b/templates/swagger/ui.tmpl
index e2324f9b5b..355169f007 100644
--- a/templates/swagger/ui.tmpl
+++ b/templates/swagger/ui.tmpl
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 	<head>
-		<title>Gitea API</title>
+		<title>Forgejo API</title>
 		<link href="{{AssetUrlPrefix}}/css/swagger.css?v={{AssetVersion}}" rel="stylesheet">
 	</head>
 	<body>
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 70e3d9b176..a74fd2d065 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -13,8 +13,8 @@
   ],
   "swagger": "2.0",
   "info": {
-    "description": "This documentation describes the Gitea API.",
-    "title": "Gitea API.",
+    "description": "This documentation describes the Forgejo API.",
+    "title": "Forgejo API.",
     "license": {
       "name": "MIT",
       "url": "http://opensource.org/licenses/MIT"

From 507abee353f120247276fe9165f09976421f926d Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sat, 14 Jan 2023 08:16:30 +0100
Subject: [PATCH 12/36] [BRANDING] add X-Forgejo-* headers

(cherry picked from commit 0a3388f93f53f53cce79ebcc194d67979cbe61cc)
(cherry picked from commit 7eba0a440a3138443d0b7461560f9f6f1c46b256)
(cherry picked from commit eb9646c7ef0b1a9e73bf22806acbc2caeaee7ff3)
(cherry picked from commit f1972578f5cb72ad9e1ef1ded9aa324b1d669864)

Conflicts:
(cherry picked from commit 7f96222fb4b4a773193a11d4ba76f449013c30ef)
(cherry picked from commit e3c7c9fe7b5809cdb75f1eb629c82b27986f7e98)
(cherry picked from commit 84fdead90242e68493efb96a7fee1e3b5fd417e9)
(cherry picked from commit 85148e11961b86269b7cda30294a4cdc817787d0)
(cherry picked from commit c0086bd70d39d9a1075fa624cdbfdf5ef26f7a2c)
(cherry picked from commit d1e31ef31817e5e811f6bea7aee5582383d53b12)
(cherry picked from commit 681d3ed5c43d45f802dc13c58c5b821da938374d)
(cherry picked from commit 76a3001f5bc5a064054514c179ba14008952e914)
(cherry picked from commit a55a9567d36f6b60557df3df3a0801c0fccec963)
(cherry picked from commit aa7adc167d4e4ee7879b88fe799f2afca2fd5531)
(cherry picked from commit d5354cb52c26ab0090388d019efe61770e7ec452)
(cherry picked from commit 472c48999699420d15aaa7c61a42db8136221616)
(cherry picked from commit dc816d065b715f2bfdc7fa68fa2d254f3d481b35)
(cherry picked from commit 4795f9ea85eac21c70db1159914a7b7b035b7374)
(cherry picked from commit ddd4ae53433d4adab823aa974c0f1c39d0394414)
(cherry picked from commit 0e95f2a36b1c0f480f94fef85d341792c7a7b759)
(cherry picked from commit 47a41a4e7b3c5d3cf247dafef17a64415069f171)
(cherry picked from commit d4416fcd3ee0f1d74c2b03fbe40c15b83f80b56d)
(cherry picked from commit f279d153b61677e2a766859c7a7688b0327e7c9a)
(cherry picked from commit 959f908ffdc9dd2fb07aefdf7cb85ba34f9071a3)
(cherry picked from commit 82df95310176a083abb9eaa51de9e9754d4f72c6)
(cherry picked from commit 8f8c9fd9e3deca0af0f087fc44fcd271e8440a7b)
(cherry picked from commit d4a0db7706f30a394192c6023072ad5185a7d600)
(cherry picked from commit 44594d623942128072bd86a20b5b90603517005e)
(cherry picked from commit 62b1de579ebfe326340b218cc9a980b705b8e6a2)
---
 modules/httpcache/httpcache.go      |  1 +
 modules/httpcache/httpcache_test.go |  3 +++
 routers/api/v1/api.go               |  2 +-
 routers/api/v1/repo/file.go         |  7 ++++++-
 services/mailer/mail.go             | 10 ++++++++++
 services/webhook/deliver.go         |  4 ++++
 6 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/modules/httpcache/httpcache.go b/modules/httpcache/httpcache.go
index b57b321832..10f626b3f3 100644
--- a/modules/httpcache/httpcache.go
+++ b/modules/httpcache/httpcache.go
@@ -30,6 +30,7 @@ func SetCacheControlInHeader(h http.Header, maxAge time.Duration, additionalDire
 
 		// to remind users they are using non-prod setting.
 		h.Set("X-Gitea-Debug", "RUN_MODE="+setting.RunMode)
+		h.Set("X-Forgejo-Debug", "RUN_MODE="+setting.RunMode)
 	}
 
 	h.Set("Cache-Control", strings.Join(append(directives, additionalDirectives...), ", "))
diff --git a/modules/httpcache/httpcache_test.go b/modules/httpcache/httpcache_test.go
index d81f06097c..65a8a9b8fb 100644
--- a/modules/httpcache/httpcache_test.go
+++ b/modules/httpcache/httpcache_test.go
@@ -18,6 +18,9 @@ func countFormalHeaders(h http.Header) (c int) {
 		if strings.HasPrefix(k, "X-Gitea-") {
 			continue
 		}
+		if strings.HasPrefix(k, "X-Forgejo-") {
+			continue
+		}
 		c++
 	}
 	return c
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index d0af47239c..22e135a563 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -721,7 +721,7 @@ func Routes() *web.Route {
 			// setting.CORSConfig.AllowSubdomain // FIXME: the cors middleware needs allowSubdomain option
 			AllowedMethods:   setting.CORSConfig.Methods,
 			AllowCredentials: setting.CORSConfig.AllowCredentials,
-			AllowedHeaders:   append([]string{"Authorization", "X-Gitea-OTP"}, setting.CORSConfig.Headers...),
+			AllowedHeaders:   append([]string{"Authorization", "X-Gitea-OTP", "X-Forgejo-OTP"}, setting.CORSConfig.Headers...),
 			MaxAge:           int(setting.CORSConfig.MaxAge.Seconds()),
 		}))
 	}
diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go
index ea311c3202..9ee10f6ce1 100644
--- a/routers/api/v1/repo/file.go
+++ b/routers/api/v1/repo/file.go
@@ -33,7 +33,10 @@ import (
 	files_service "code.gitea.io/gitea/services/repository/files"
 )
 
-const giteaObjectTypeHeader = "X-Gitea-Object-Type"
+const (
+	giteaObjectTypeHeader   = "X-Gitea-Object-Type"
+	forgejoObjectTypeHeader = "X-Forgejo-Object-Type"
+)
 
 // GetRawFile get a file by path on a repository
 func GetRawFile(ctx *context.APIContext) {
@@ -80,6 +83,7 @@ func GetRawFile(ctx *context.APIContext) {
 	}
 
 	ctx.RespHeader().Set(giteaObjectTypeHeader, string(files_service.GetObjectTypeFromTreeEntry(entry)))
+	ctx.RespHeader().Set(forgejoObjectTypeHeader, string(files_service.GetObjectTypeFromTreeEntry(entry)))
 
 	if err := common.ServeBlob(ctx.Base, ctx.Repo.TreePath, blob, lastModified); err != nil {
 		ctx.Error(http.StatusInternalServerError, "ServeBlob", err)
@@ -129,6 +133,7 @@ func GetRawFileOrLFS(ctx *context.APIContext) {
 	}
 
 	ctx.RespHeader().Set(giteaObjectTypeHeader, string(files_service.GetObjectTypeFromTreeEntry(entry)))
+	ctx.RespHeader().Set(forgejoObjectTypeHeader, string(files_service.GetObjectTypeFromTreeEntry(entry)))
 
 	// LFS Pointer files are at most 1024 bytes - so any blob greater than 1024 bytes cannot be an LFS file
 	if blob.Size() > 1024 {
diff --git a/services/mailer/mail.go b/services/mailer/mail.go
index 50d59a4452..50a2cc57d3 100644
--- a/services/mailer/mail.go
+++ b/services/mailer/mail.go
@@ -415,6 +415,16 @@ func generateAdditionalHeaders(ctx *mailCommentContext, reason string, recipient
 		"X-Gitea-Issue-ID":          strconv.FormatInt(ctx.Issue.Index, 10),
 		"X-Gitea-Issue-Link":        ctx.Issue.HTMLURL(),
 
+		"X-Forgejo-Reason":            reason,
+		"X-Forgejo-Sender":            ctx.Doer.DisplayName(),
+		"X-Forgejo-Recipient":         recipient.DisplayName(),
+		"X-Forgejo-Recipient-Address": recipient.Email,
+		"X-Forgejo-Repository":        repo.Name,
+		"X-Forgejo-Repository-Path":   repo.FullName(),
+		"X-Forgejo-Repository-Link":   repo.HTMLURL(),
+		"X-Forgejo-Issue-ID":          strconv.FormatInt(ctx.Issue.Index, 10),
+		"X-Forgejo-Issue-Link":        ctx.Issue.HTMLURL(),
+
 		"X-GitHub-Reason":            reason,
 		"X-GitHub-Sender":            ctx.Doer.DisplayName(),
 		"X-GitHub-Recipient":         recipient.DisplayName(),
diff --git a/services/webhook/deliver.go b/services/webhook/deliver.go
index fd7a3d7fba..d13fe1c5d3 100644
--- a/services/webhook/deliver.go
+++ b/services/webhook/deliver.go
@@ -123,6 +123,10 @@ func Deliver(ctx context.Context, t *webhook_model.HookTask) error {
 
 	event := t.EventType.Event()
 	eventType := string(t.EventType)
+	req.Header.Add("X-Forgejo-Delivery", t.UUID)
+	req.Header.Add("X-Forgejo-Event", event)
+	req.Header.Add("X-Forgejo-Event-Type", eventType)
+	req.Header.Add("X-Forgejo-Signature", signatureSHA256)
 	req.Header.Add("X-Gitea-Delivery", t.UUID)
 	req.Header.Add("X-Gitea-Event", event)
 	req.Header.Add("X-Gitea-Event-Type", eventType)

From 270f4020b0714ac553498fc986457b0c627d85a6 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sat, 14 Jan 2023 10:07:01 +0100
Subject: [PATCH 13/36] [BRANDING] add the forgejo webhook type & update
 webhook docs URLs

templates/swagger/v1_json.tmpl updated with `make generate-swagger`

(cherry picked from commit 88899c492efeedd138ba088a36b9c0bc733ead7b)
(cherry picked from commit 7171bd9617c32c4911e3bdbc23c02a19e80d2465)
(cherry picked from commit 1a742446c17aef9ca62fe75bfc0a388d40138154)
(cherry picked from commit d7c189d7b2f9fea299a31adf068db969920ae39d)

Conflicts:
	routers/web/web.go
(cherry picked from commit cbdea868e41fb38ca491f8b449c3e525ec82d6b9)
(cherry picked from commit 6cd150483b06e17aee023c0afd01a3f2460b3415)
(cherry picked from commit 47246da8d3f50a02d11b77b3d402618b144aa720)
(cherry picked from commit f2aa0e6b769d432e627798bcf294b04b7d253213)
(cherry picked from commit 5a4fc69a16de8d6199ea24198299297ef7a3587b)
(cherry picked from commit 48e444ca09c22f930514a01846b0c8bc3cef35ab)
(cherry picked from commit 888e53781175d8d977f66d78991bd66563fcddfb)
(cherry picked from commit 5121f493c99f19d8050aa09224ac3532b4100ec7)
(cherry picked from commit 9394e55fdf80bf3d7bf8b2aba561ad44a84e3913)
(cherry picked from commit 3a2ce51768de65892e3ec73596e3862354c9502e)
(cherry picked from commit 719ead3a651f12afbb59c856914b0085e5cee157)
(cherry picked from commit 83e6f82e2aea619a3cd502e133773d33c0e60133)
(cherry picked from commit 494a429b21c6234be38b9e3db0f930fbb8118205)
(cherry picked from commit 4d775db6b41f731e956cc6bb9217ef349b4a3635)
(cherry picked from commit b68f777dc2822ec5c4e30186675cc82daec092a9)
(cherry picked from commit 5b934023fa58820f27c349c26f2a1ce89aee6795)
(cherry picked from commit 3b1ed8b16c73374cd5b6339f5315229dc82488da)
(cherry picked from commit 6bc4a46c9fc6472e1c4bf0bb20dea6867f1b392f)
(cherry picked from commit 8064bb24a3c752a86271f154ad4d0c4763e07295)

Conflicts:
	templates/admin/hook_new.tmpl
	templates/org/settings/hook_new.tmpl
	templates/repo/settings/webhook/base_list.tmpl
	templates/repo/settings/webhook/new.tmpl
	templates/user/settings/hook_new.tmpl
	https://codeberg.org/forgejo/forgejo/pulls/1181
(cherry picked from commit 55f5588a9150d8912c0f8342495f858e4e1e2959)
(cherry picked from commit a428bc06b353e7b678acc6a1ec2576608f1a5d9a)
(cherry picked from commit d2186eceb960773d037756c991f50d177fd63954)
(cherry picked from commit b4e126e9afd1c51b214e36a585bb454dac32862f)
(cherry picked from commit e4c7a92c2d7142cac74cf05a2b1fe3f0bd0c7373)
(cherry picked from commit a7165c8146a604b6ec5f8ee4db4c926fef180857)

Conflicts:
	templates/admin/hook_new.tmpl
	templates/repo/settings/webhook/new.tmpl
	https://codeberg.org/forgejo/forgejo/pulls/1420

[BRANDING] add the forgejo webhook type & update webhook docs URLs (squash) gitea logo for gitea webhooks

Refs: https://codeberg.org/forgejo/forgejo/issues/1367
(cherry picked from commit 2d8c1b93734acec918729e27c5613a8f9fb41ceb)
(cherry picked from commit 9135a5e1dbcff07e9fff4c1001fcac8c05e0c82b)
---
 modules/setting/webhook.go                    |  2 +-
 modules/structs/hook.go                       |  2 +-
 modules/webhook/type.go                       |  1 +
 routers/web/repo/setting/webhook.go           | 30 +++++++++++++-
 routers/web/web.go                            |  2 +
 services/webhook/webhook.go                   |  4 +-
 .../repo/settings/webhook/base_list.tmpl      |  4 ++
 templates/repo/settings/webhook/forgejo.tmpl  | 40 +++++++++++++++++++
 templates/repo/settings/webhook/gitea.tmpl    |  2 +-
 templates/repo/settings/webhook/gogs.tmpl     |  2 +-
 templates/shared/webhook/icon.tmpl            |  6 ++-
 templates/swagger/v1_json.tmpl                |  1 +
 templates/webhook/new.tmpl                    |  1 +
 tests/integration/links_test.go               | 30 ++++++++++++++
 14 files changed, 118 insertions(+), 9 deletions(-)
 create mode 100644 templates/repo/settings/webhook/forgejo.tmpl

diff --git a/modules/setting/webhook.go b/modules/setting/webhook.go
index c01261dbbd..b56c55c439 100644
--- a/modules/setting/webhook.go
+++ b/modules/setting/webhook.go
@@ -35,7 +35,7 @@ func loadWebhookFrom(rootCfg ConfigProvider) {
 	Webhook.DeliverTimeout = sec.Key("DELIVER_TIMEOUT").MustInt(5)
 	Webhook.SkipTLSVerify = sec.Key("SKIP_TLS_VERIFY").MustBool()
 	Webhook.AllowedHostList = sec.Key("ALLOWED_HOST_LIST").MustString("")
-	Webhook.Types = []string{"gitea", "gogs", "slack", "discord", "dingtalk", "telegram", "msteams", "feishu", "matrix", "wechatwork", "packagist"}
+	Webhook.Types = []string{"forgejo", "gitea", "gogs", "slack", "discord", "dingtalk", "telegram", "msteams", "feishu", "matrix", "wechatwork", "packagist"}
 	Webhook.PagingNum = sec.Key("PAGING_NUM").MustInt(10)
 	Webhook.ProxyURL = sec.Key("PROXY_URL").MustString("")
 	if Webhook.ProxyURL != "" {
diff --git a/modules/structs/hook.go b/modules/structs/hook.go
index 0babe84410..9afcebdc59 100644
--- a/modules/structs/hook.go
+++ b/modules/structs/hook.go
@@ -41,7 +41,7 @@ type CreateHookOptionConfig map[string]string
 // CreateHookOption options when create a hook
 type CreateHookOption struct {
 	// required: true
-	// enum: dingtalk,discord,gitea,gogs,msteams,slack,telegram,feishu,wechatwork,packagist
+	// enum: forgejo,dingtalk,discord,gitea,gogs,msteams,slack,telegram,feishu,wechatwork,packagist
 	Type string `json:"type" binding:"Required"`
 	// required: true
 	Config              CreateHookOptionConfig `json:"config" binding:"Required"`
diff --git a/modules/webhook/type.go b/modules/webhook/type.go
index 7042d391b7..7f427f2ea8 100644
--- a/modules/webhook/type.go
+++ b/modules/webhook/type.go
@@ -72,6 +72,7 @@ type HookType = string
 
 // Types of webhooks
 const (
+	FORGEJO    HookType = "forgejo"
 	GITEA      HookType = "gitea"
 	GOGS       HookType = "gogs"
 	SLACK      HookType = "slack"
diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go
index 33ea2c206b..718e2a0bc2 100644
--- a/routers/web/repo/setting/webhook.go
+++ b/routers/web/repo/setting/webhook.go
@@ -44,7 +44,7 @@ func Webhooks(ctx *context.Context) {
 	ctx.Data["PageIsSettingsHooks"] = true
 	ctx.Data["BaseLink"] = ctx.Repo.RepoLink + "/settings/hooks"
 	ctx.Data["BaseLinkNew"] = ctx.Repo.RepoLink + "/settings/hooks"
-	ctx.Data["Description"] = ctx.Tr("repo.settings.hooks_desc", "https://docs.gitea.com/usage/webhooks")
+	ctx.Data["Description"] = ctx.Tr("repo.settings.hooks_desc", "https://forgejo.org/docs/latest/user/webhooks/")
 
 	ws, err := webhook.ListWebhooksByOpts(ctx, &webhook.ListWebhookOptions{RepoID: ctx.Repo.Repository.ID})
 	if err != nil {
@@ -309,6 +309,34 @@ func editWebhook(ctx *context.Context, params webhookParams) {
 	ctx.Redirect(fmt.Sprintf("%s/%d", orCtx.Link, w.ID))
 }
 
+// ForgejoHooksNewPost response for creating Forgejo webhook
+func ForgejoHooksNewPost(ctx *context.Context) {
+	createWebhook(ctx, forgejoHookParams(ctx))
+}
+
+// ForgejoHooksEditPost response for editing Forgejo webhook
+func ForgejoHooksEditPost(ctx *context.Context) {
+	editWebhook(ctx, forgejoHookParams(ctx))
+}
+
+func forgejoHookParams(ctx *context.Context) webhookParams {
+	form := web.GetForm(ctx).(*forms.NewWebhookForm)
+
+	contentType := webhook.ContentTypeJSON
+	if webhook.HookContentType(form.ContentType) == webhook.ContentTypeForm {
+		contentType = webhook.ContentTypeForm
+	}
+
+	return webhookParams{
+		Type:        webhook_module.FORGEJO,
+		URL:         form.PayloadURL,
+		ContentType: contentType,
+		Secret:      form.Secret,
+		HTTPMethod:  form.HTTPMethod,
+		WebhookForm: form.WebhookForm,
+	}
+}
+
 // GiteaHooksNewPost response for creating Gitea webhook
 func GiteaHooksNewPost(ctx *context.Context) {
 	createWebhook(ctx, giteaHookParams(ctx))
diff --git a/routers/web/web.go b/routers/web/web.go
index bb0327f8f7..51e955525f 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -279,6 +279,7 @@ func registerRoutes(m *web.Route) {
 
 	addWebhookAddRoutes := func() {
 		m.Get("/{type}/new", repo_setting.WebhooksNew)
+		m.Post("/forgejo/new", web.Bind(forms.NewWebhookForm{}), repo_setting.ForgejoHooksNewPost)
 		m.Post("/gitea/new", web.Bind(forms.NewWebhookForm{}), repo_setting.GiteaHooksNewPost)
 		m.Post("/gogs/new", web.Bind(forms.NewGogshookForm{}), repo_setting.GogsHooksNewPost)
 		m.Post("/slack/new", web.Bind(forms.NewSlackHookForm{}), repo_setting.SlackHooksNewPost)
@@ -293,6 +294,7 @@ func registerRoutes(m *web.Route) {
 	}
 
 	addWebhookEditRoutes := func() {
+		m.Post("/forgejo/{id}", web.Bind(forms.NewWebhookForm{}), repo_setting.ForgejoHooksEditPost)
 		m.Post("/gitea/{id}", web.Bind(forms.NewWebhookForm{}), repo_setting.GiteaHooksEditPost)
 		m.Post("/gogs/{id}", web.Bind(forms.NewGogshookForm{}), repo_setting.GogsHooksEditPost)
 		m.Post("/slack/{id}", web.Bind(forms.NewSlackHookForm{}), repo_setting.SlackHooksEditPost)
diff --git a/services/webhook/webhook.go b/services/webhook/webhook.go
index 9d5dab85f7..f15c853331 100644
--- a/services/webhook/webhook.go
+++ b/services/webhook/webhook.go
@@ -70,7 +70,7 @@ var webhooks = map[webhook_module.HookType]*webhook{
 
 // IsValidHookTaskType returns true if a webhook registered
 func IsValidHookTaskType(name string) bool {
-	if name == webhook_module.GITEA || name == webhook_module.GOGS {
+	if name == webhook_module.FORGEJO || name == webhook_module.GITEA || name == webhook_module.GOGS {
 		return true
 	}
 	_, ok := webhooks[name]
@@ -177,7 +177,7 @@ func PrepareWebhook(ctx context.Context, w *webhook_model.Webhook, event webhook
 	// Avoid sending "0 new commits" to non-integration relevant webhooks (e.g. slack, discord, etc.).
 	// Integration webhooks (e.g. drone) still receive the required data.
 	if pushEvent, ok := p.(*api.PushPayload); ok &&
-		w.Type != webhook_module.GITEA && w.Type != webhook_module.GOGS &&
+		w.Type != webhook_module.FORGEJO && w.Type != webhook_module.GITEA && w.Type != webhook_module.GOGS &&
 		len(pushEvent.Commits) == 0 {
 		return nil
 	}
diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl
index 1bc9447110..755f0a57c6 100644
--- a/templates/repo/settings/webhook/base_list.tmpl
+++ b/templates/repo/settings/webhook/base_list.tmpl
@@ -4,6 +4,10 @@
 		<div class="ui jump dropdown">
 			<div class="ui primary tiny button">{{.locale.Tr "repo.settings.add_webhook"}}</div>
 			<div class="menu">
+				<a class="item" href="{{.BaseLinkNew}}/forgejo/new">
+					{{template "shared/webhook/icon" (dict "HookType" "forgejo" "Size" 20)}}
+					{{.locale.Tr "repo.settings.web_hook_name_forgejo"}}
+				</a>
 				<a class="item" href="{{.BaseLinkNew}}/gitea/new">
 					{{template "shared/webhook/icon" (dict "HookType" "gitea" "Size" 20)}}
 					{{.locale.Tr "repo.settings.web_hook_name_gitea"}}
diff --git a/templates/repo/settings/webhook/forgejo.tmpl b/templates/repo/settings/webhook/forgejo.tmpl
new file mode 100644
index 0000000000..320b064f93
--- /dev/null
+++ b/templates/repo/settings/webhook/forgejo.tmpl
@@ -0,0 +1,40 @@
+{{if eq .HookType "forgejo"}}
+	<p>{{.locale.Tr "repo.settings.add_web_hook_desc" "https://forgejo.org/docs/latest/user/webhooks/" (.locale.Tr "repo.settings.web_hook_name_forgejo") | Str2html}}</p>
+	<form class="ui form" action="{{.BaseLink}}/forgejo/{{or .Webhook.ID "new"}}" method="post">
+		{{template "base/disable_form_autofill"}}
+		{{.CsrfTokenHtml}}
+		<div class="required field {{if .Err_PayloadURL}}error{{end}}">
+			<label for="payload_url">{{.locale.Tr "repo.settings.payload_url"}}</label>
+			<input id="payload_url" name="payload_url" type="url" value="{{.Webhook.URL}}" autofocus required>
+		</div>
+		<div class="field">
+			<label>{{.locale.Tr "repo.settings.http_method"}}</label>
+			<div class="ui selection dropdown">
+				<input type="hidden" id="http_method" name="http_method" value="{{if .Webhook.HTTPMethod}}{{.Webhook.HTTPMethod}}{{else}}POST{{end}}">
+				<div class="default text"></div>
+				{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+				<div class="menu">
+					<div class="item" data-value="POST">POST</div>
+					<div class="item" data-value="GET">GET</div>
+				</div>
+			</div>
+		</div>
+		<div class="field">
+			<label>{{.locale.Tr "repo.settings.content_type"}}</label>
+			<div class="ui selection dropdown">
+				<input type="hidden" id="content_type" name="content_type" value="{{if .Webhook.ContentType}}{{.Webhook.ContentType}}{{else}}1{{end}}">
+				<div class="default text"></div>
+				{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+				<div class="menu">
+					<div class="item" data-value="1">application/json</div>
+					<div class="item" data-value="2">application/x-www-form-urlencoded</div>
+				</div>
+			</div>
+		</div>
+		<div class="field {{if .Err_Secret}}error{{end}}">
+			<label for="secret">{{.locale.Tr "repo.settings.secret"}}</label>
+			<input id="secret" name="secret" type="password" value="{{.Webhook.Secret}}" autocomplete="off">
+		</div>
+		{{template "repo/settings/webhook/settings" .}}
+	</form>
+{{end}}
diff --git a/templates/repo/settings/webhook/gitea.tmpl b/templates/repo/settings/webhook/gitea.tmpl
index 1850c663b1..396fd7e5ba 100644
--- a/templates/repo/settings/webhook/gitea.tmpl
+++ b/templates/repo/settings/webhook/gitea.tmpl
@@ -1,5 +1,5 @@
 {{if eq .HookType "gitea"}}
-	<p>{{.locale.Tr "repo.settings.add_web_hook_desc" "https://docs.gitea.com/usage/webhooks" (.locale.Tr "repo.settings.web_hook_name_gitea") | Str2html}}</p>
+	<p>{{.locale.Tr "repo.settings.add_web_hook_desc" "https://forgejo.org/docs/latest/user/webhooks/" (.locale.Tr "repo.settings.web_hook_name_gitea") | Str2html}}</p>
 	<form class="ui form" action="{{.BaseLink}}/gitea/{{or .Webhook.ID "new"}}" method="post">
 		{{template "base/disable_form_autofill"}}
 		{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/webhook/gogs.tmpl b/templates/repo/settings/webhook/gogs.tmpl
index 176c24eb93..3f0c51deac 100644
--- a/templates/repo/settings/webhook/gogs.tmpl
+++ b/templates/repo/settings/webhook/gogs.tmpl
@@ -1,5 +1,5 @@
 {{if eq .HookType "gogs"}}
-	<p>{{.locale.Tr "repo.settings.add_web_hook_desc" "https://docs.gitea.com/usage/webhooks" (.locale.Tr "repo.settings.web_hook_name_gogs") | Str2html}}</p>
+	<p>{{.locale.Tr "repo.settings.add_web_hook_desc" "https://forgejo.org/docs/latest/user/webhooks/" (.locale.Tr "repo.settings.web_hook_name_gogs") | Str2html}}</p>
 	<form class="ui form" action="{{.BaseLink}}/gogs/{{or .Webhook.ID "new"}}" method="post">
 		{{template "base/disable_form_autofill"}}
 		{{.CsrfTokenHtml}}
diff --git a/templates/shared/webhook/icon.tmpl b/templates/shared/webhook/icon.tmpl
index 84f9de266f..a6507bab5b 100644
--- a/templates/shared/webhook/icon.tmpl
+++ b/templates/shared/webhook/icon.tmpl
@@ -2,8 +2,10 @@
 {{if .Size}}
 	{{$size = .Size}}
 {{end}}
-{{if eq .HookType "gitea"}}
-	<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/gitea.svg">
+{{if eq .HookType "forgejo"}}
+	<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/forgejo.svg">
+{{else if eq .HookType "gitea"}}
+	<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/gitea-original.svg">
 {{else if eq .HookType "gogs"}}
 	<img width="{{$size}}" height="{{$size}}" src="{{AssetUrlPrefix}}/img/gogs.ico">
 {{else if eq .HookType "slack"}}
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index a74fd2d065..593f5d45d5 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -17253,6 +17253,7 @@
         "type": {
           "type": "string",
           "enum": [
+            "forgejo",
             "dingtalk",
             "discord",
             "gitea",
diff --git a/templates/webhook/new.tmpl b/templates/webhook/new.tmpl
index a185c42b51..60c729eee3 100644
--- a/templates/webhook/new.tmpl
+++ b/templates/webhook/new.tmpl
@@ -5,6 +5,7 @@
 	</div>
 </h4>
 <div class="ui attached segment">
+	{{template "repo/settings/webhook/forgejo" .ctxData}}
 	{{template "repo/settings/webhook/gitea" .ctxData}}
 	{{template "repo/settings/webhook/gogs" .ctxData}}
 	{{template "repo/settings/webhook/slack" .ctxData}}
diff --git a/tests/integration/links_test.go b/tests/integration/links_test.go
index 91655833af..e780a071ef 100644
--- a/tests/integration/links_test.go
+++ b/tests/integration/links_test.go
@@ -174,3 +174,33 @@ func TestLinksLogin(t *testing.T) {
 
 	testLinksAsUser("user2", t)
 }
+
+func TestRedirectsWebhooks(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	//
+	// A redirect means the route exists but not if it performs as intended.
+	//
+	for _, kind := range []string{"forgejo", "gitea"} {
+		redirects := []struct {
+			from string
+			to   string
+			verb string
+		}{
+			{from: "/user2/repo1/settings/hooks/" + kind + "/new", to: "/user/login", verb: "GET"},
+			{from: "/user/settings/hooks/" + kind + "/new", to: "/user/login", verb: "GET"},
+			{from: "/admin/system-hooks/" + kind + "/new", to: "/user/login", verb: "GET"},
+			{from: "/admin/default-hooks/" + kind + "/new", to: "/user/login", verb: "GET"},
+			{from: "/user2/repo1/settings/hooks/" + kind + "/new", to: "/", verb: "POST"},
+			{from: "/admin/system-hooks/" + kind + "/new", to: "/", verb: "POST"},
+			{from: "/admin/default-hooks/" + kind + "/new", to: "/", verb: "POST"},
+			{from: "/user2/repo1/settings/hooks/" + kind + "/1", to: "/", verb: "POST"},
+			{from: "/admin/hooks/" + kind + "/1", to: "/", verb: "POST"},
+		}
+		for _, info := range redirects {
+			req := NewRequest(t, info.verb, info.from)
+			resp := MakeRequest(t, req, http.StatusSeeOther)
+			assert.EqualValues(t, path.Join(setting.AppSubURL, info.to), test.RedirectURL(resp), info.from)
+		}
+	}
+}

From f4e9a251d80363360bbcd9280c68421e87ec1630 Mon Sep 17 00:00:00 2001
From: Gusted <postmaster@gusted.xyz>
Date: Sat, 4 Feb 2023 11:20:21 +0100
Subject: [PATCH 14/36] [BRANDING] Update nodeinfo branding

- Change the values for the nodeinfo API, to use branded values.
- Resolves https://codeberg.org/forgejo/forgejo/issues/257

(cherry picked from commit 4608c57688d8b12dbc265dd21bfe7cd269efb116)
(cherry picked from commit e837e8a52943f803a40cd0151e24f7fe8edb11ec)
(cherry picked from commit 6601328d3ce9b57dbaa768dd2d41295293ff94f9)
(cherry picked from commit c6be21d4870e6b748a85f0da19bd4b717875b224)
(cherry picked from commit 5adc6ffee2e6f1af72039747df809aa6ebd2198f)
(cherry picked from commit 2ff8d166ac1e56ab7a349d70f875bd2ae9763418)
(cherry picked from commit b6a90e7e5af0e998cbbf1fc1edb901ae31090999)
(cherry picked from commit d1089e706cda009a6a23462adf498fd24a609b0a)

Conflicts:
	tests/integration/api_nodeinfo_test.go
(cherry picked from commit 7a29df737d979abed4d37f084e3a92ee788d2c6e)
(cherry picked from commit 3655a30c60229167bc007e139d0461a5648741d5)
(cherry picked from commit c90d61141016ffbbaaa6b4f4657dacf5446f30c0)
(cherry picked from commit 0274bd8860bd00de628fba990e42bf7385ddf5b9)
(cherry picked from commit fdb786b71decd1c968f7c473c94463140f192fc3)
(cherry picked from commit 4f08f100a19886210b89d1cacfd09e6db0e48fb7)
(cherry picked from commit 56a27118227521fae93e052bb77265fb10c6dcf8)
(cherry picked from commit 3b2cfa452df0d2651a75c5e3fcd442c38acff109)
(cherry picked from commit 773ddcf956a897bbaa75aff3087f8a64b254239c)
(cherry picked from commit fe8321ed4e9dcf0df2dffb64b0245ec1ae8f075d)
(cherry picked from commit a94833643b6796000a69c7ff4dfbc0b5df98b0f4)
(cherry picked from commit 3fdbda7639f0690b1dc8b046a9b1979571714d41)
(cherry picked from commit 7bc63d2cd3144d00cbc9429297b994382140bd5d)
(cherry picked from commit a36400d9cf4392573d8bd13ded54a4c5689dd541)
(cherry picked from commit 2535ab42016132c2ee7882d3eb5eb42c00ed7e63)
(cherry picked from commit 692e72f4f64b4a0251ac7ac99a268b531d73c6fc)
(cherry picked from commit 265021f3e9f327da96df695f90d6e9d0a23dd824)
(cherry picked from commit bc833125d6b0a3c7b0fc117e3bb081cb9ec6f02c)
(cherry picked from commit f1f9f881559c4117a547afaa379bcd0c26afb1aa)
(cherry picked from commit 6076461ad7a77e77ecbd9963689435496d1852e6)
(cherry picked from commit cd1da0aa2bac7270b3da2c5b76da2ea197a2f32d)
---
 routers/api/v1/misc/nodeinfo.go        | 6 +++---
 tests/integration/api_nodeinfo_test.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/routers/api/v1/misc/nodeinfo.go b/routers/api/v1/misc/nodeinfo.go
index 319c3483e1..9e6e2e3db1 100644
--- a/routers/api/v1/misc/nodeinfo.go
+++ b/routers/api/v1/misc/nodeinfo.go
@@ -65,10 +65,10 @@ func NodeInfo(ctx *context.APIContext) {
 	nodeInfo := &structs.NodeInfo{
 		Version: "2.1",
 		Software: structs.NodeInfoSoftware{
-			Name:       "gitea",
+			Name:       "forgejo",
 			Version:    setting.AppVer,
-			Repository: "https://github.com/go-gitea/gitea.git",
-			Homepage:   "https://gitea.io/",
+			Repository: "https://codeberg.org/forgejo/forgejo.git",
+			Homepage:   "https://forgejo.org/",
 		},
 		Protocols: []string{"activitypub"},
 		Services: structs.NodeInfoServices{
diff --git a/tests/integration/api_nodeinfo_test.go b/tests/integration/api_nodeinfo_test.go
index a347ec5b3b..6acb7b484c 100644
--- a/tests/integration/api_nodeinfo_test.go
+++ b/tests/integration/api_nodeinfo_test.go
@@ -31,7 +31,7 @@ func TestNodeinfo(t *testing.T) {
 		var nodeinfo api.NodeInfo
 		DecodeJSON(t, resp, &nodeinfo)
 		assert.True(t, nodeinfo.OpenRegistrations)
-		assert.Equal(t, "gitea", nodeinfo.Software.Name)
+		assert.Equal(t, "forgejo", nodeinfo.Software.Name)
 		assert.Equal(t, 25, nodeinfo.Usage.Users.Total)
 		assert.Equal(t, 19, nodeinfo.Usage.LocalPosts)
 		assert.Equal(t, 2, nodeinfo.Usage.LocalComments)

From fb58c852229b8944725d1fe48496cf2e7878af34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Dachary?= <loic@dachary.org>
Date: Thu, 16 Feb 2023 10:36:14 +0100
Subject: [PATCH 15/36] [BRANDING] reserve forgejo-actions username

(cherry picked from commit 2a25be788bdf3b58b236cb2a9f503b569703a0c6)
(cherry picked from commit b270d5815c80f387759eecbfcb588e548f5ed956)
(cherry picked from commit e7382cc71e43c52abcabc59d09128450ce415d26)
(cherry picked from commit 665400ea1e92405f41590bccf800714440ded50a)
(cherry picked from commit f5b2c691f17d6a66fd8041a83b36194f7d630339)
(cherry picked from commit 3df97adfefac63ddd1d44cc553a2c81087706d47)
(cherry picked from commit 494f6eafc15f235cd7ca5d4f01e7ac16eea8bd5b)
(cherry picked from commit 822e3d2c833e2a92d337812a93a6c78638b14456)
(cherry picked from commit 7460f1256852256048e7a7eb1dad108a0caa3567)
(cherry picked from commit f6cd70881e828688a73f277252cdf1bf1904fbe2)
(cherry picked from commit c669ce8173f0f819834436fd571d25c8678ec187)
(cherry picked from commit 1d5a433e0282681c6ebcd9ee0cb5deb644509f7d)
(cherry picked from commit c1a4dc150c617a8210c5907e9d93e41f01a01a2f)
(cherry picked from commit dd1c971c6c86ae80323c47084eb724d305428943)
(cherry picked from commit 8d2dcd9b1ed055875bdc123aab6bf6ea54539296)
(cherry picked from commit b6bb8fd2750c76454cbc014134d3a6049021ca5a)
(cherry picked from commit d4b71fe96e043389453a6595ccae0faae0113ca3)
(cherry picked from commit e204ec0b2359b85bde65d2b56463dd8e3655405f)
(cherry picked from commit 8d9f1174bd568fa8c74e433981b3bf79ba91bfbf)
(cherry picked from commit e314a7d5ba2aea572bffe8c69e36cc60ef7663f5)
(cherry picked from commit 48b3ad5a303900474ad87014d90889c9fd4a9b9c)
(cherry picked from commit 71ed4b7c694ab6ac7e2647274b202f49c9502e0f)
(cherry picked from commit d63324ccb647a93c026a5a01ccd79cd73ec8b600)
(cherry picked from commit 9249e893dbb096418945a462d35327013f865bbc)
(cherry picked from commit 78f156427b6ff2dd6e7dc4092f7ea4e18786cdb0)
(cherry picked from commit c3d4a1a602712ff64f152a0c78d2ac438b957dd4)
(cherry picked from commit 83b1855f559e315143cdd82bc9f028c1302cf9b2)
(cherry picked from commit 319815d9b1634dfe99b00fb8334d4342280b5d57)
(cherry picked from commit c4fcbfd2972b533e85e934ba5f23478c52b86dea)
---
 models/user/user.go        | 1 +
 models/user/user_system.go | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/models/user/user.go b/models/user/user.go
index 86cf2ad280..3385ab83ca 100644
--- a/models/user/user.go
+++ b/models/user/user.go
@@ -553,6 +553,7 @@ var (
 		"user",
 		"v2",
 		"gitea-actions",
+		"forgejo-actions",
 	}
 
 	// DON'T ADD ANY NEW STUFF, WE SOLVE THIS WITH `/user/{obj}` PATHS!
diff --git a/models/user/user_system.go b/models/user/user_system.go
index f54f4e3ffb..e3f79a4baf 100644
--- a/models/user/user_system.go
+++ b/models/user/user_system.go
@@ -37,9 +37,9 @@ func NewReplaceUser(name string) *User {
 
 const (
 	ActionsUserID   = -2
-	ActionsUserName = "gitea-actions"
-	ActionsFullName = "Gitea Actions"
-	ActionsEmail    = "teabot@gitea.io"
+	ActionsUserName = "forgejo-actions"
+	ActionsFullName = "Forgejo Actions"
+	ActionsEmail    = "noreply@forgejo.org"
 )
 
 // NewActionsUser creates and returns a fake user for running the actions.

From d3d914bba2bec4f50f9d71d347b510771df99656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Dachary?= <loic@dachary.org>
Date: Thu, 23 Feb 2023 22:26:33 +0100
Subject: [PATCH 16/36] [BRANDING] symlink gitea to forgejo in docker
 containers

(cherry picked from commit 9c06a318b867ea8c60dd194ca393bac3b718b07b)
(cherry picked from commit 95859da3b40306c1e07277230c2f401ef8b82a13)
(cherry picked from commit e3a5f6c1ed4e5452f3664aa8d398805c3b9c0a51)
(cherry picked from commit 7b9b259c75e0b2b805a2239ecf7c85a3f0dbd648)
(cherry picked from commit c4a152c8dc4ab5d20c72f9f7d60ce6eee3be5cda)
(cherry picked from commit b00bf599efa97a18adac134a1402418785c5bae2)
(cherry picked from commit a7836ee2ee2638091f0f9ff5543548ae0bb94060)
(cherry picked from commit 3ea7dcbd5b196b6fc9115d49d50678a1a5940c0b)
(cherry picked from commit 454d705e830ade3a41a33341b82d4c8aff584dcd)
(cherry picked from commit 35e06c3009f4a1942222dc35cc0993a623164b25)
(cherry picked from commit 904468a38ffdfb8157dc4eaf92b3ba10c3a957db)
(cherry picked from commit 890e86815a5a33b2930150a7460cd96b4360ac88)
(cherry picked from commit bf9f94c63d8c15ce62881ccadc28681848b7ebd7)
(cherry picked from commit d025d061d14929aaabbfc4603099e32cb888ac3b)
(cherry picked from commit 32f209a8e1b2ee109f7ae8b150d4390318c0ff2a)
(cherry picked from commit 38ef6802fca7301f4cb03769e8d6dae1e256933f)
(cherry picked from commit 8a19bbd2a8160b7d3d5a1ea083507b4311070ab6)
(cherry picked from commit f352dee786d2541fbe360fe8f859d3182c632240)
(cherry picked from commit b53d9fc090b58848876b4f97e8ed03face85a63b)
(cherry picked from commit 3dae21f4c87c82b75515d3db43c1bbd4d9f3f1ac)
(cherry picked from commit 8b59e016c7a1eb3f6d0077d8e6f205b8bcefe402)
(cherry picked from commit 6f54ea6a0eb0f9c4360237f78eb76c55678547e2)
(cherry picked from commit ed8d90de6bb9513a2dcdc70aac446bbcaf0855c9)
(cherry picked from commit 26ffd3fcace55279091fe95074a65dd1c4b7758a)
(cherry picked from commit 287b3bbfb5a66e64d3490a282153bfd2393b7afa)
(cherry picked from commit ab81378d0c88def332f43843eeac23ef768bb143)
(cherry picked from commit f6bbe7e875e707fcbadf7434818edb897467a5ef)
(cherry picked from commit 8968f34edf064e6bffc3cc7054307c6303256acd)
---
 Dockerfile          | 1 +
 Dockerfile.rootless | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 8068e824a1..c4bb245ad2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -77,6 +77,7 @@ ENTRYPOINT ["/usr/bin/entrypoint"]
 CMD ["/bin/s6-svscan", "/etc/s6"]
 
 COPY docker/root /
+RUN cd /usr/local/bin ; ln -s gitea forgejo
 COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea
 COPY --from=build-env /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini
 COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh
diff --git a/Dockerfile.rootless b/Dockerfile.rootless
index d7676c906a..fccf144318 100644
--- a/Dockerfile.rootless
+++ b/Dockerfile.rootless
@@ -67,6 +67,7 @@ RUN mkdir -p /var/lib/gitea /etc/gitea
 RUN chown git:git /var/lib/gitea /etc/gitea
 
 COPY docker/rootless /
+RUN cd /usr/local/bin ; ln -s gitea forgejo
 COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea
 COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini
 COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh

From 254d1a2f9a9751cb2e0d9475f2f6c7579120cd32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Dachary?= <loic@dachary.org>
Date: Fri, 24 Feb 2023 13:38:29 +0100
Subject: [PATCH 17/36] [BRANDING] alias {FORGEJO,GITEA}_{CUSTOM,WORK_DIR}

FORGEJO_* environment variables are set to the corresponding GITEA_*
variable when the cli starts. This approach is intended to minimize
the conflicts on rebase. All occurences of GITEA_* are left untouched
in the codebase and they are only changed to FORGEJO_* if exposed to
the user.

(cherry picked from commit e466f9d10e145a3ed750f0c86cfcafad5f141ea8)
(cherry picked from commit e33e95931b0d91c41433db68ddb19a8724b8ed80)
(cherry picked from commit 2cfc6519b7cbc758f8322fd7f7b84dfc6d14ae73)
(cherry picked from commit af8864373a65441c817dad1c3b696157c4024a7e)
(cherry picked from commit a0550ff3391f0575b72c3d0d1fdf1fcd9b51e4d6)
(cherry picked from commit 24dc0a5191a26fac0aef6b3a53fd58b9185edc88)
(cherry picked from commit e255eea2b48ad39eeb3eae227ca0d4fd4b667d99)
(cherry picked from commit 0c4f5afa7a37e6b805efb452b9d4166f7e2cec61)
(cherry picked from commit 42fce708d05d616ebbdfb2eecf384ad2fdaa1d7a)
(cherry picked from commit e7278c3c22b656e5730ec2ba0c1b4ee2ef6627ce)
(cherry picked from commit 0fb9ed7e0eb5db59ab5b574d3d69b4b161f50b0b)
(cherry picked from commit a98308aa4d6659f46f7f69996167f9c2f3c4e859)
(cherry picked from commit b8695fcbe04792cb75acb62fdf9c6dee237e8365)
(cherry picked from commit 4aee8719f57b40f8645905c10ba8966b29052295)
(cherry picked from commit 1c503c1ba7414fe0b960187bcc370b44c536ec7f)
(cherry picked from commit cf1ed8551e6a8abc56d3ed45b65b0e6ca4e1e891)
(cherry picked from commit c52459b088cd52bf3b11b68cadf95d738fd09269)
(cherry picked from commit 92cac277b28f9b68d3346f5dd463bc41c1952af6)
(cherry picked from commit 2c744f11189ca76de62be908069500d7dbfc2a8f)
(cherry picked from commit 989a98a8c52342fb146938c41c1db9a0818013f4)
(cherry picked from commit 9cf7052bd4c126618833487134cb39dbe6d58297)
(cherry picked from commit a13c9667e04555d38106bf7e63d57b05002b20ee)

Conflicts:
	main.go
	https://codeberg.org/forgejo/forgejo/pulls/1216
(cherry picked from commit a9c3cf060d76ece0664b05f03690bd3a7d8f7089)
(cherry picked from commit eb6d904b23bce2bc02ea96db0459b7b7a8e55cae)
(cherry picked from commit fd4878e4877ced8a65cb348c69220b688556a214)
(cherry picked from commit cc2cab92410e13abdd88c6ae8acfd17ee6e7fb0a)
(cherry picked from commit be523c63dbc7d3dc1f852bb7aee045cf2d9f74fa)
---
 cmd/main.go                  |  6 +--
 main.go                      |  9 ++++
 modules/setting/path.go      | 18 ++++++-
 modules/setting/path_test.go | 92 ++++++++++++++++++++++++++++++++++++
 4 files changed, 121 insertions(+), 4 deletions(-)

diff --git a/cmd/main.go b/cmd/main.go
index 04209c824b..d1a632fb83 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -153,9 +153,9 @@ func NewMainApp(version, versionExtra string) *cli.App {
 
 func innerNewMainApp(version, versionExtra string, subCmdsStandaloneArgs, subCmdWithConfigArgs []*cli.Command) *cli.App {
 	app := cli.NewApp()
-	app.Name = "Gitea"
-	app.Usage = "A painless self-hosted Git service"
-	app.Description = `By default, Gitea will start serving using the web-server with no argument, which can alternatively be run by running the subcommand "web".`
+	app.Name = "Forgejo"
+	app.Usage = "Beyond coding. We forge."
+	app.Description = `By default, forgejo will start serving using the web-server with no argument, which can alternatively be run by running the subcommand "web".`
 	app.Version = version + versionExtra
 	app.EnableBashCompletion = true
 
diff --git a/main.go b/main.go
index 700b75d748..56f97caf27 100644
--- a/main.go
+++ b/main.go
@@ -40,7 +40,16 @@ func init() {
 	setting.AppStartTime = time.Now().UTC()
 }
 
+func forgejoEnv() {
+	for _, k := range []string{"CUSTOM", "WORK_DIR"} {
+		if v, ok := os.LookupEnv("FORGEJO_" + k); ok {
+			os.Setenv("GITEA_"+k, v)
+		}
+	}
+}
+
 func main() {
+	forgejoEnv()
 	cli.OsExiter = func(code int) {
 		log.GetManager().Close()
 		os.Exit(code)
diff --git a/modules/setting/path.go b/modules/setting/path.go
index 0fdc305aa1..85d0e06302 100644
--- a/modules/setting/path.go
+++ b/modules/setting/path.go
@@ -129,6 +129,14 @@ func InitWorkPathAndCfgProvider(getEnvFn func(name string) string, args ArgWorkP
 			}
 		}
 
+		envWorkPath = getEnvFn("FORGEJO_WORK_DIR")
+		if envWorkPath != "" {
+			tmpWorkPath.Set(envWorkPath)
+			if !filepath.IsAbs(tmpWorkPath.Value) {
+				log.Fatal("FORGEJO_WORK_DIR (work path) must be absolute path")
+			}
+		}
+
 		envCustomPath := getEnvFn("GITEA_CUSTOM")
 		if envCustomPath != "" {
 			tmpCustomPath.Set(envCustomPath)
@@ -136,6 +144,14 @@ func InitWorkPathAndCfgProvider(getEnvFn func(name string) string, args ArgWorkP
 				log.Fatal("GITEA_CUSTOM (custom path) must be absolute path")
 			}
 		}
+
+		envCustomPath = getEnvFn("FORGEJO_CUSTOM")
+		if envCustomPath != "" {
+			tmpCustomPath.Set(envCustomPath)
+			if !filepath.IsAbs(tmpCustomPath.Value) {
+				log.Fatal("FORGEJO_CUSTOM (custom path) must be absolute path")
+			}
+		}
 	}
 
 	readFromArgs := func() {
@@ -180,7 +196,7 @@ func InitWorkPathAndCfgProvider(getEnvFn func(name string) string, args ArgWorkP
 			log.Fatal("WORK_PATH in %q must be absolute path", configWorkPath)
 		}
 		configWorkPath = filepath.Clean(configWorkPath)
-		if tmpWorkPath.Value != "" && (getEnvFn("GITEA_WORK_DIR") != "" || args.WorkPath != "") {
+		if tmpWorkPath.Value != "" && (getEnvFn("GITEA_WORK_DIR") != "" || getEnvFn("FORGEJO_WORK_DIR") != "" || args.WorkPath != "") {
 			fi1, err1 := os.Stat(tmpWorkPath.Value)
 			fi2, err2 := os.Stat(configWorkPath)
 			if err1 != nil || err2 != nil || !os.SameFile(fi1, fi2) {
diff --git a/modules/setting/path_test.go b/modules/setting/path_test.go
index fc6a2116dc..4508bae50f 100644
--- a/modules/setting/path_test.go
+++ b/modules/setting/path_test.go
@@ -60,6 +60,22 @@ func TestInitWorkPathAndCommonConfig(t *testing.T) {
 		assert.Equal(t, fp(dirXxx, "custom/conf/app.ini"), CustomConf)
 	})
 
+	t.Run("WorkDir(env)", func(t *testing.T) {
+		testInit(dirFoo, "", "")
+		InitWorkPathAndCommonConfig(envVars{"FORGEJO_WORK_DIR": dirBar}.Getenv, ArgWorkPathAndCustomConf{})
+		assert.Equal(t, dirBar, AppWorkPath)
+		assert.Equal(t, fp(dirBar, "custom"), CustomPath)
+		assert.Equal(t, fp(dirBar, "custom/conf/app.ini"), CustomConf)
+	})
+
+	t.Run("WorkDir(env,arg)", func(t *testing.T) {
+		testInit(dirFoo, "", "")
+		InitWorkPathAndCommonConfig(envVars{"FORGEJO_WORK_DIR": dirBar}.Getenv, ArgWorkPathAndCustomConf{WorkPath: dirXxx})
+		assert.Equal(t, dirXxx, AppWorkPath)
+		assert.Equal(t, fp(dirXxx, "custom"), CustomPath)
+		assert.Equal(t, fp(dirXxx, "custom/conf/app.ini"), CustomConf)
+	})
+
 	t.Run("CustomPath(env)", func(t *testing.T) {
 		testInit(dirFoo, "", "")
 		InitWorkPathAndCommonConfig(envVars{"GITEA_CUSTOM": fp(dirBar, "custom1")}.Getenv, ArgWorkPathAndCustomConf{})
@@ -76,6 +92,22 @@ func TestInitWorkPathAndCommonConfig(t *testing.T) {
 		assert.Equal(t, fp(dirFoo, "custom2/conf/app.ini"), CustomConf)
 	})
 
+	t.Run("CustomPath(env)", func(t *testing.T) {
+		testInit(dirFoo, "", "")
+		InitWorkPathAndCommonConfig(envVars{"FORGEJO_CUSTOM": fp(dirBar, "custom1")}.Getenv, ArgWorkPathAndCustomConf{})
+		assert.Equal(t, dirFoo, AppWorkPath)
+		assert.Equal(t, fp(dirBar, "custom1"), CustomPath)
+		assert.Equal(t, fp(dirBar, "custom1/conf/app.ini"), CustomConf)
+	})
+
+	t.Run("CustomPath(env,arg)", func(t *testing.T) {
+		testInit(dirFoo, "", "")
+		InitWorkPathAndCommonConfig(envVars{"FORGEJO_CUSTOM": fp(dirBar, "custom1")}.Getenv, ArgWorkPathAndCustomConf{CustomPath: "custom2"})
+		assert.Equal(t, dirFoo, AppWorkPath)
+		assert.Equal(t, fp(dirFoo, "custom2"), CustomPath)
+		assert.Equal(t, fp(dirFoo, "custom2/conf/app.ini"), CustomConf)
+	})
+
 	t.Run("CustomConf", func(t *testing.T) {
 		testInit(dirFoo, "", "")
 		InitWorkPathAndCommonConfig(envVars{}.Getenv, ArgWorkPathAndCustomConf{CustomConf: "app1.ini"})
@@ -115,6 +147,32 @@ func TestInitWorkPathAndCommonConfig(t *testing.T) {
 		assert.True(t, AppWorkPathMismatch)
 	})
 
+	t.Run("CustomConfOverrideWorkPath", func(t *testing.T) {
+		iniWorkPath := fp(tmpDir, "app-workpath.ini")
+		_ = os.WriteFile(iniWorkPath, []byte("WORK_PATH="+dirXxx), 0o644)
+
+		testInit(dirFoo, "", "")
+		InitWorkPathAndCommonConfig(envVars{}.Getenv, ArgWorkPathAndCustomConf{CustomConf: iniWorkPath})
+		assert.Equal(t, dirXxx, AppWorkPath)
+		assert.Equal(t, fp(dirXxx, "custom"), CustomPath)
+		assert.Equal(t, iniWorkPath, CustomConf)
+		assert.False(t, AppWorkPathMismatch)
+
+		testInit(dirFoo, "", "")
+		InitWorkPathAndCommonConfig(envVars{"FORGEJO_WORK_DIR": dirBar}.Getenv, ArgWorkPathAndCustomConf{CustomConf: iniWorkPath})
+		assert.Equal(t, dirXxx, AppWorkPath)
+		assert.Equal(t, fp(dirXxx, "custom"), CustomPath)
+		assert.Equal(t, iniWorkPath, CustomConf)
+		assert.True(t, AppWorkPathMismatch)
+
+		testInit(dirFoo, "", "")
+		InitWorkPathAndCommonConfig(envVars{}.Getenv, ArgWorkPathAndCustomConf{WorkPath: dirBar, CustomConf: iniWorkPath})
+		assert.Equal(t, dirXxx, AppWorkPath)
+		assert.Equal(t, fp(dirXxx, "custom"), CustomPath)
+		assert.Equal(t, iniWorkPath, CustomConf)
+		assert.True(t, AppWorkPathMismatch)
+	})
+
 	t.Run("Builtin", func(t *testing.T) {
 		testInit(dirFoo, dirBar, dirXxx)
 		InitWorkPathAndCommonConfig(envVars{}.Getenv, ArgWorkPathAndCustomConf{})
@@ -148,4 +206,38 @@ func TestInitWorkPathAndCommonConfig(t *testing.T) {
 		assert.Equal(t, fp(dirXxx, "custom1"), CustomPath)
 		assert.Equal(t, iniWorkPath, CustomConf)
 	})
+
+	t.Run("Builtin", func(t *testing.T) {
+		testInit(dirFoo, dirBar, dirXxx)
+		InitWorkPathAndCommonConfig(envVars{}.Getenv, ArgWorkPathAndCustomConf{})
+		assert.Equal(t, dirFoo, AppWorkPath)
+		assert.Equal(t, dirBar, CustomPath)
+		assert.Equal(t, dirXxx, CustomConf)
+
+		testInit(dirFoo, "custom1", "cfg.ini")
+		InitWorkPathAndCommonConfig(envVars{}.Getenv, ArgWorkPathAndCustomConf{})
+		assert.Equal(t, dirFoo, AppWorkPath)
+		assert.Equal(t, fp(dirFoo, "custom1"), CustomPath)
+		assert.Equal(t, fp(dirFoo, "custom1/cfg.ini"), CustomConf)
+
+		testInit(dirFoo, "custom1", "cfg.ini")
+		InitWorkPathAndCommonConfig(envVars{"FORGEJO_WORK_DIR": dirYyy}.Getenv, ArgWorkPathAndCustomConf{})
+		assert.Equal(t, dirYyy, AppWorkPath)
+		assert.Equal(t, fp(dirYyy, "custom1"), CustomPath)
+		assert.Equal(t, fp(dirYyy, "custom1/cfg.ini"), CustomConf)
+
+		testInit(dirFoo, "custom1", "cfg.ini")
+		InitWorkPathAndCommonConfig(envVars{"FORGEJO_CUSTOM": dirYyy}.Getenv, ArgWorkPathAndCustomConf{})
+		assert.Equal(t, dirFoo, AppWorkPath)
+		assert.Equal(t, dirYyy, CustomPath)
+		assert.Equal(t, fp(dirYyy, "cfg.ini"), CustomConf)
+
+		iniWorkPath := fp(tmpDir, "app-workpath.ini")
+		_ = os.WriteFile(iniWorkPath, []byte("WORK_PATH="+dirXxx), 0o644)
+		testInit(dirFoo, "custom1", "cfg.ini")
+		InitWorkPathAndCommonConfig(envVars{}.Getenv, ArgWorkPathAndCustomConf{CustomConf: iniWorkPath})
+		assert.Equal(t, dirXxx, AppWorkPath)
+		assert.Equal(t, fp(dirXxx, "custom1"), CustomPath)
+		assert.Equal(t, iniWorkPath, CustomConf)
+	})
 }

From 72821dd14052505814df556e09a500981256f709 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Mon, 27 Feb 2023 19:03:01 +0100
Subject: [PATCH 18/36] [BRANDING] link to forgejo.org/docs instead of
 docs.gitea.io

(cherry picked from commit 3efafd0e083eb331ce06681351a40c4f46d7c96f)
(cherry picked from commit 148185e34b2be36fa46e8630928ee64a73768883)
(cherry picked from commit 834e264698f710049f20491b91b3c39b853de867)
(cherry picked from commit e72fa6eb1ef8f4355197ced3c619d8ff6d9c1c9f)

[BRANDING] link to forgejo.org/docs instead of docs.gitea.io

Fix the link that was 404.

(cherry picked from commit ae515d7258602a0fe4bb4471f2017e4ccc7dd0e7)
(cherry picked from commit facc2367f0e5fc1e1162cc2478a658f050c07718)
(cherry picked from commit 25784b9f21a37d9161b050503b0d45d87cd8863d)
(cherry picked from commit 2efc6138d92e958ee6a6091e579fa269aea45ce4)
(cherry picked from commit b9d0871631ef70abe88de64ccbabcfc94a49274b)
(cherry picked from commit f0446e51b9c2268f274a1c4b8c25abfcf417975c)
(cherry picked from commit 1638aa67fb384bdcd97386861054447a8d53e832)
(cherry picked from commit 290db6a018d4f82173446799b8726a320c209bb4)
(cherry picked from commit 89b87cf5426b7407ba0e23912fbbd3c521a8bae4)
(cherry picked from commit 656ed949625652a3a0e8d0b1381e76f75688e461)
(cherry picked from commit 036f879f96d606af691326474cefe77441c8c4ed)
(cherry picked from commit 69eea35f813d03f578ca143e45292289b0ad92a8)
(cherry picked from commit b72e3f4a92a04ac065b5b72ca25f7eb0c96ba69d)
(cherry picked from commit af606b8574d67c8c7a3699cf41d6a96fc3852547)
(cherry picked from commit 7e47f8135c08be3f48ccad6b8d8a940bc5713e53)
(cherry picked from commit 0e5218cc5374a0e16a273298f862dd3d6cebe020)
(cherry picked from commit 7c2a20a528a6911412986ff8eb479f3a19d7f226)
(cherry picked from commit 4e94006363227435b53769b92882b51a6109ba52)
(cherry picked from commit e47cdfc43fb693dfd0507bb1fe943da41fd2ebb4)
(cherry picked from commit 1dcb3e1da4ab4d8dbb659e87c4f542245b066409)
(cherry picked from commit 67367c4e0f4b755879350e9311e44deff95c137c)
(cherry picked from commit 252087d1ffcae00dfa7e8edc7face8775412d4cc)
(cherry picked from commit f5977a43e5cb2c869af0cd8c993cd0d3eeccb622)

Conflicts:
	templates/base/head_navbar.tmpl
	https://codeberg.org/forgejo/forgejo/pulls/1351
(cherry picked from commit 594938eb1505f6d81d8c0cce84a34c20a18b5c7a)
(cherry picked from commit 0257d038a7416fd208571d8be0a14a9ea6ac4d95)
---
 templates/base/head_navbar.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index 5a2d0ddb0b..29b0207b11 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -48,7 +48,7 @@
 		{{template "custom/extra_links" .}}
 
 		{{if not .IsSigned}}
-			<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.com">{{.locale.Tr "help"}}</a>
+			<a class="item" target="_blank" rel="noopener noreferrer" href="https://forgejo.org/docs/latest/">{{.locale.Tr "help"}}</a>
 		{{end}}
 	</div>
 
@@ -171,7 +171,7 @@
 						{{svg "octicon-tools"}}
 						{{.locale.Tr "your_settings"}}
 					</a>
-					<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.com">
+					<a class="item" target="_blank" rel="noopener noreferrer" href="https://forgejo.org/docs/latest/">
 						{{svg "octicon-question"}}
 						{{.locale.Tr "help"}}
 					</a>

From b36723e52b975d2e57af363db1d9118f48feade1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Dachary?= <loic@dachary.org>
Date: Fri, 24 Feb 2023 14:24:29 +0100
Subject: [PATCH 19/36] [BRANDING] X-Forgejo-OTP can be used instead of
 X-Gitea-OTP

(cherry picked from commit 7b0549cd70aa7cafec853e15b25270847c59850b)
(cherry picked from commit 13e10a65d974c7b594681bfa36402a6144862116)
(cherry picked from commit 65bdd73cf27895a9fb8db2a95ef4f5b08951481d)
(cherry picked from commit 64eba8bb923176b4c286b1d0c83792f3c3005ca8)
(cherry picked from commit 4c49b1a759abe3604afc1121e83c9a942016ad6a)
(cherry picked from commit 93b4d0640683ea986657453b1fce49a00c861764)
(cherry picked from commit e2bc5f36d958f4349160ec145719c302d4023cd0)
(cherry picked from commit 2bee76f9dfa998c83ea4fe648997fad0b6224fa9)
(cherry picked from commit 3d8a1b4a9fb9dc55bbd62fd8855ea85e58dc263f)
(cherry picked from commit 99dd092cd02d7af8374acf454833ce1c05fd4fd9)
(cherry picked from commit 0fdbd02204d533f907cd22c83c73bf0156ec4a88)
(cherry picked from commit 70b277a183c0d85966fa84e9b054f164ae2d2a44)
(cherry picked from commit 3eece7fbb4e67d970d8979d0d60a58ee2a195ea5)
(cherry picked from commit 4838fc9e1145a74c56926de68854234604b5e38f)
(cherry picked from commit b76ed541cf4d73702a83d6b96f8618b6f8c44393)
(cherry picked from commit dcdfb5b65c6fbf50798a0c49d0f879dd1285ee41)
(cherry picked from commit 377dc48cdc3b1c2bcc95f86a7bf3602468ac5c39)
(cherry picked from commit acc862f411c79f7832c8ba2c182af738f25f4f8b)
(cherry picked from commit ac75ef101f89d58442760cec21a3f3f9199d4710)
(cherry picked from commit 08f2d9f7c5b0d51358b009b0b38b626b231ec32b)
(cherry picked from commit e4096f0b6441ba68719146e5a48ef44233e27a86)
(cherry picked from commit bf5876f06224ac90e931f2f47b66a5b9c38b2a87)
(cherry picked from commit 7dc60637e5e097b5dbc38e068ee7ba553385b496)
(cherry picked from commit ef3101774ba5083e259d84db9997ff0aaddab14c)
(cherry picked from commit ecb9e8867c3503387cbaf97df27d8c60a840f4a4)
(cherry picked from commit 64f0ae72fec30ea443d73f8566c140682e7b9838)
(cherry picked from commit 8dd6ec786294741361f79c08b0c051d2258bda02)
---
 modules/context/api.go              | 11 +++++++++--
 modules/context/api_forgejo_test.go | 23 +++++++++++++++++++++++
 routers/api/v1/api.go               |  2 +-
 templates/swagger/v1_json.tmpl      |  2 +-
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 modules/context/api_forgejo_test.go

diff --git a/modules/context/api.go b/modules/context/api.go
index 58532b883d..e0a615331e 100644
--- a/modules/context/api.go
+++ b/modules/context/api.go
@@ -205,13 +205,20 @@ func (ctx *APIContext) SetLinkHeader(total, pageSize int) {
 	}
 }
 
+func getOtpHeader(header http.Header) string {
+	otpHeader := header.Get("X-Gitea-OTP")
+	if forgejoHeader := header.Get("X-Forgejo-OTP"); forgejoHeader != "" {
+		otpHeader = forgejoHeader
+	}
+	return otpHeader
+}
+
 // CheckForOTP validates OTP
 func (ctx *APIContext) CheckForOTP() {
 	if skip, ok := ctx.Data["SkipLocalTwoFA"]; ok && skip.(bool) {
 		return // Skip 2FA
 	}
 
-	otpHeader := ctx.Req.Header.Get("X-Gitea-OTP")
 	twofa, err := auth.GetTwoFactorByUID(ctx.Doer.ID)
 	if err != nil {
 		if auth.IsErrTwoFactorNotEnrolled(err) {
@@ -220,7 +227,7 @@ func (ctx *APIContext) CheckForOTP() {
 		ctx.Error(http.StatusInternalServerError, "GetTwoFactorByUID", err)
 		return
 	}
-	ok, err := twofa.ValidateTOTP(otpHeader)
+	ok, err := twofa.ValidateTOTP(getOtpHeader(ctx.Req.Header))
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "ValidateTOTP", err)
 		return
diff --git a/modules/context/api_forgejo_test.go b/modules/context/api_forgejo_test.go
new file mode 100644
index 0000000000..b85de55904
--- /dev/null
+++ b/modules/context/api_forgejo_test.go
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: MIT
+
+package context
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetOtpHeader(t *testing.T) {
+	header := http.Header{}
+	assert.EqualValues(t, "", getOtpHeader(header))
+	// Gitea
+	giteaOtp := "123456"
+	header.Set("X-Gitea-OTP", giteaOtp)
+	assert.EqualValues(t, giteaOtp, getOtpHeader(header))
+	// Forgejo has precedence
+	forgejoOtp := "abcdef"
+	header.Set("X-Forgejo-OTP", forgejoOtp)
+	assert.EqualValues(t, forgejoOtp, getOtpHeader(header))
+}
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 22e135a563..300aee76f4 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -56,7 +56,7 @@
 //	     description: Sudo API request as the user provided as the key. Admin privileges are required.
 //	TOTPHeader:
 //	     type: apiKey
-//	     name: X-GITEA-OTP
+//	     name: X-FORGEJO-OTP
 //	     in: header
 //	     description: Must be used in combination with BasicAuth if two-factor authentication is enabled.
 //
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 593f5d45d5..e26c612271 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -23553,7 +23553,7 @@
     "TOTPHeader": {
       "description": "Must be used in combination with BasicAuth if two-factor authentication is enabled.",
       "type": "apiKey",
-      "name": "X-GITEA-OTP",
+      "name": "X-FORGEJO-OTP",
       "in": "header"
     },
     "Token": {

From 6aadfd01201f5c715b2aed1a73a3832b9722d81b Mon Sep 17 00:00:00 2001
From: Rychart Redwerkz <redwerkz@noreply.codeberg.org>
Date: Mon, 6 Mar 2023 05:10:56 +0100
Subject: [PATCH 20/36] [BRANDING] Rebrand dump log

(cherry picked from commit b92a65a23f8d586d30336c79596ee8a73e6c2dad)
(cherry picked from commit eaeb9f183ff9fdb9710b776bb26b0920e34065c0)
(cherry picked from commit cdbd0ebe5eb4db0c89e82893cba503bcdbfe7bbf)
(cherry picked from commit 8aaa4e3f4d67cb8f077ca1d115d04a9c966c18ee)
(cherry picked from commit 6d7d3f048e3639bc9683ff157f7d9530dfc2e1cb)
(cherry picked from commit 1b6a2971ad4c84e33ff882fdf81ca6f46ba3cb44)
(cherry picked from commit 4f7f35043daecefa0ddb5c6f3afcf033d091c362)
(cherry picked from commit 495a4351b160800723e159244f7aa843f536c926)
(cherry picked from commit 12d89b03a97dba8468a4526d9ee6af40643f9885)
(cherry picked from commit 476d49ff11d32deba7d087f097e656669f3a840a)
(cherry picked from commit d6e95828c3f13f6a79d5657764d245701500a57c)
(cherry picked from commit d043e8d69d942c0950180bbb3ab2c97783a022e3)
(cherry picked from commit b06027344270d2dbd724695e8084a39b2e7563b8)
(cherry picked from commit 20437285c553f8aa5c7a857c98d1680798eac592)
(cherry picked from commit 0bc9eee5f31eacae875668e3cd4ba399ad98d9f5)
(cherry picked from commit b9f843776f4a80d646743fd5cca2579ddf46dd5b)
(cherry picked from commit e6d64de500e4324d574d1715cb5dc49b7bf672fb)
(cherry picked from commit 5ce2ff2f8b7049c5b3e1ce5bebcaf40368ea7641)
(cherry picked from commit 659677cf886c396a76aa7426df312d5ff44ce094)
(cherry picked from commit 648a5d944e9e9bb1a9a09cdc37b311db0a7f3f79)
(cherry picked from commit a77c8be7042cc67c6043732cffabdeabd42d117d)
(cherry picked from commit 012cb570464deb87060322b43da872362ce69533)
(cherry picked from commit 2da63c976eacf9c481d9561539e2abd04c0b5ea6)
(cherry picked from commit 792ce8b1b7045c8559d39aaa4dc86ef24609034f)
(cherry picked from commit a4b3244712317fa64e27f8d471203648113759f6)
(cherry picked from commit 9ffc3571f184430502ce2b63c80e6f25661dd885)
---
 cmd/dump.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/dump.go b/cmd/dump.go
index 97f292ae09..99d9f38978 100644
--- a/cmd/dump.go
+++ b/cmd/dump.go
@@ -98,15 +98,15 @@ var outputTypeEnum = &outputType{
 // CmdDump represents the available dump sub-command.
 var CmdDump = &cli.Command{
 	Name:  "dump",
-	Usage: "Dump Gitea files and database",
+	Usage: "Dump Forgejo files and database",
 	Description: `Dump compresses all related files and database into zip file.
-It can be used for backup and capture Gitea server image to send to maintainer`,
+It can be used for backup and capture Forgejo server image to send to maintainer`,
 	Action: runDump,
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:    "file",
 			Aliases: []string{"f"},
-			Value:   fmt.Sprintf("gitea-dump-%d.zip", time.Now().Unix()),
+			Value:   fmt.Sprintf("forgejo-dump-%d.zip", time.Now().Unix()),
 			Usage:   "Name of the dump file which will be created. Supply '-' for stdout. See type for available types.",
 		},
 		&cli.BoolFlag{
@@ -209,7 +209,7 @@ func runDump(ctx *cli.Context) error {
 
 	if !setting.InstallLock {
 		log.Error("Is '%s' really the right config path?\n", setting.CustomConf)
-		return fmt.Errorf("gitea is not initialized")
+		return fmt.Errorf("forgejo is not initialized")
 	}
 	setting.LoadSettings() // cannot access session settings otherwise
 
@@ -288,7 +288,7 @@ func runDump(ctx *cli.Context) error {
 		fatal("Path does not exist: %s", tmpDir)
 	}
 
-	dbDump, err := os.CreateTemp(tmpDir, "gitea-db.sql")
+	dbDump, err := os.CreateTemp(tmpDir, "forgejo-db.sql")
 	if err != nil {
 		fatal("Failed to create tmp file: %v", err)
 	}
@@ -310,8 +310,8 @@ func runDump(ctx *cli.Context) error {
 		fatal("Failed to dump database: %v", err)
 	}
 
-	if err := addFile(w, "gitea-db.sql", dbDump.Name(), verbose); err != nil {
-		fatal("Failed to include gitea-db.sql: %v", err)
+	if err := addFile(w, "forgejo-db.sql", dbDump.Name(), verbose); err != nil {
+		fatal("Failed to include forgejo-db.sql: %v", err)
 	}
 
 	if len(setting.CustomConf) > 0 {

From a7d590f7d71c2cdb37088f6f84ca3e493189583a Mon Sep 17 00:00:00 2001
From: lauralani <dev@lauka.net>
Date: Wed, 29 Mar 2023 10:21:43 +0200
Subject: [PATCH 21/36] [BRANDING] adapt forgejo/contrib/upgrade.sh

Reviewed at: https://codeberg.org/forgejo/forgejo/pulls/605

(cherry picked from commit ab986185d08a30e0172c4fcd7870803c31f843bd)
(cherry picked from commit 6068aed2a7f413e3196dd4cf704bc2cf63b36329)
(cherry picked from commit 0cbd599c0c418f9a53a039fd06d9861ac58dcc68)
(cherry picked from commit c3ef13588230e8eba9c42ddfddf966a20ab3f745)
(cherry picked from commit 0ba7194fa1cb709b40a6699a8bda29292999277b)
(cherry picked from commit 572a2a51252075c5e0e64b91c5a09c5b34353f71)
(cherry picked from commit dd0a7265e12abec694828381aaa4e1f1c4c634e7)
(cherry picked from commit 06bd195f4e9a963fead7295d9ca76ed185176675)
(cherry picked from commit 7f6100ab6ba2e0671cc2450f65d7b0933afec936)
(cherry picked from commit 58af04560a00b0f09ee8ba6ef3aa75cdf577edc2)
(cherry picked from commit 67a951f726dee99d7c035bf781c9c7253eba228f)
(cherry picked from commit 46e68309adf44ef2c6795d9de673a9327803cf7e)
(cherry picked from commit 9002654915ec16f1962f8408c39d5360dfd7dad5)
(cherry picked from commit 3f1a3a13113f186993856c77e784abb9f5917c7c)
(cherry picked from commit df1716deb446bd021c7ee4bd610fb0f06706613a)
(cherry picked from commit 8ace62b4135a944921d3ba1465bf89cb702b74b9)
(cherry picked from commit 30ab21f2642e29833eba9fbe75f9e7bd8b6ec3da)
(cherry picked from commit 7ec99bfc0da0b3c70c8ff9e5bc770c3e8a4dd495)
(cherry picked from commit 47a554c9b41db0bfe4e612838a5e30e234d067cd)
(cherry picked from commit c5aaf49d88c14f11b733ec6fb23f85f633a48196)
(cherry picked from commit 7fb42a78a41f1d3522a50d8193cb61e4df282acd)
(cherry picked from commit 336fd64a1f1fc70a9ebe3f238c591128abbfbb16)
---
 contrib/upgrade.sh | 94 +++++++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/contrib/upgrade.sh b/contrib/upgrade.sh
index 4b166a02a0..4240b5694f 100755
--- a/contrib/upgrade.sh
+++ b/contrib/upgrade.sh
@@ -1,42 +1,42 @@
 #!/usr/bin/env bash
-# This is an update script for gitea installed via the binary distribution
-# from dl.gitea.com on linux as systemd service. It performs a backup and updates
-# Gitea in place.
-# NOTE: This adds the GPG Signing Key of the Gitea maintainers to the keyring.
+# This is an update script for forgejo installed via the binary distribution
+# from codeberg.org/forgejo/forgejo on linux as systemd service. It
+# performs a backup and updates Forgejo in place.
+# NOTE: This adds the GPG Signing Key of the Forgejo maintainers to the keyring.
 # Depends on: bash, curl, xz, sha256sum. optionally jq, gpg
 #   See section below for available environment vars.
 #   When no version is specified, updates to the latest release.
 # Examples:
 #   upgrade.sh 1.15.10
-#   giteahome=/opt/gitea giteaconf=$giteahome/app.ini upgrade.sh
+#   forgejohome=/opt/forgejo forgejoconf=$forgejohome/app.ini upgrade.sh
 
-# Check if gitea service is running
-if ! pidof gitea &> /dev/null; then
-  echo "Error: gitea is not running."
+# Check if forgejo service is running
+if ! pidof forgejo &> /dev/null; then
+  echo "Error: forgejo is not running."
   exit 1
 fi
 
-# Continue with rest of the script if gitea is running
-echo "Gitea is running. Continuing with rest of script..."
+# Continue with rest of the script if forgejo is running
+echo "Forgejo is running. Continuing with rest of script..."
 
 # apply variables from environment
-: "${giteabin:="/usr/local/bin/gitea"}"
-: "${giteahome:="/var/lib/gitea"}"
-: "${giteaconf:="/etc/gitea/app.ini"}"
-: "${giteauser:="git"}"
+: "${forgejobin:="/usr/local/bin/forgejo"}"
+: "${forgejohome:="/var/lib/forgejo"}"
+: "${forgejoconf:="/etc/forgejo/app.ini"}"
+: "${forgejouser:="git"}"
 : "${sudocmd:="sudo"}"
 : "${arch:="linux-amd64"}"
-: "${service_start:="$sudocmd systemctl start gitea"}"
-: "${service_stop:="$sudocmd systemctl stop gitea"}"
-: "${service_status:="$sudocmd systemctl status gitea"}"
-: "${backupopts:=""}" # see `gitea dump --help` for available options
+: "${service_start:="$sudocmd systemctl start forgejo"}"
+: "${service_stop:="$sudocmd systemctl stop forgejo"}"
+: "${service_status:="$sudocmd systemctl status forgejo"}"
+: "${backupopts:=""}" # see `forgejo dump --help` for available options
 
-function giteacmd {
+function forgejocmd {
   if [[ $sudocmd = "su" ]]; then
     # `-c` only accept one string as argument.
-    "$sudocmd" - "$giteauser" -c "$(printf "%q " "$giteabin" "--config" "$giteaconf" "--work-path" "$giteahome" "$@")"
+    "$sudocmd" - "$forgejouser" -c "$(printf "%q " "$forgejobin" "--config" "$forgejoconf" "--work-path" "$forgejohome" "$@")"
   else
-    "$sudocmd" --user "$giteauser" "$giteabin" --config "$giteaconf" --work-path "$giteahome" "$@"
+    "$sudocmd" --user "$forgejouser" "$forgejobin" --config "$forgejoconf" --work-path "$forgejohome" "$@"
   fi
 }
 
@@ -49,7 +49,7 @@ function require {
 # parse command line arguments
 while true; do
   case "$1" in
-    -v | --version ) giteaversion="$2"; shift 2 ;;
+    -v | --version ) forgejoversion="$2"; shift 2 ;;
     -y | --yes ) no_confirm="yes"; shift ;;
     --ignore-gpg) ignore_gpg="yes"; shift ;;
     "" | -- ) shift; break ;;
@@ -65,9 +65,9 @@ if [[ -f /etc/os-release ]]; then
 
   if [[ "$os_release" =~ "OpenWrt" ]]; then
     sudocmd="su"
-    service_start="/etc/init.d/gitea start"
-    service_stop="/etc/init.d/gitea stop"
-    service_status="/etc/init.d/gitea status"
+    service_start="/etc/init.d/forgejo start"
+    service_stop="/etc/init.d/forgejo stop"
+    service_status="/etc/init.d/forgejo status"
   else
     require systemctl
   fi
@@ -76,31 +76,31 @@ fi
 require curl xz sha256sum "$sudocmd"
 
 # select version to install
-if [[ -z "${giteaversion:-}" ]]; then
+if [[ -z "${forgejoversion:-}" ]]; then
   require jq
-  giteaversion=$(curl --connect-timeout 10 -sL https://dl.gitea.com/gitea/version.json | jq -r .latest.version)
-  echo "Latest available version is $giteaversion"
+  forgejoversion=$(curl --connect-timeout 10 -sL 'https://codeberg.org/api/v1/repos/forgejo/forgejo/releases?draft=false&pre-release=false&limit=1' -H 'accept: application/json' | jq -r '.[0].tag_name | sub("v"; "")')
+  echo "Latest available version is $forgejoversion"
 fi
 
 # confirm update
 echo "Checking currently installed version..."
-current=$(giteacmd --version | cut -d ' ' -f 3)
-[[ "$current" == "$giteaversion" ]] && echo "$current is already installed, stopping." && exit 1
+current=$(forgejocmd --version | cut -d ' ' -f 3)
+[[ "$current" == "$forgejoversion" ]] && echo "$current is already installed, stopping." && exit 1
 if [[ -z "${no_confirm:-}"  ]]; then
-  echo "Make sure to read the changelog first: https://github.com/go-gitea/gitea/blob/main/CHANGELOG.md"
-  echo "Are you ready to update Gitea from ${current} to ${giteaversion}? (y/N)"
+  echo "Make sure to read the changelog first: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/CHANGELOG.md"
+  echo "Are you ready to update forgejo from ${current} to ${forgejoversion}? (y/N)"
   read -r confirm
   [[ "$confirm" == "y" ]] || [[ "$confirm" == "Y" ]] || exit 1
 fi
 
-echo "Upgrading gitea from $current to $giteaversion ..."
+echo "Upgrading forgejo from $current to $forgejoversion ..."
 
 pushd "$(pwd)" &>/dev/null
-cd "$giteahome" # needed for gitea dump later
+cd "$forgejohome" # needed for forgejo dump later
 
 # download new binary
-binname="gitea-${giteaversion}-${arch}"
-binurl="https://dl.gitea.com/gitea/${giteaversion}/${binname}.xz"
+binname="forgejo-${forgejoversion}-${arch}"
+binurl="https://codeberg.org/forgejo/forgejo/releases/download/v${forgejoversion}/${binname}.xz"
 echo "Downloading $binurl..."
 curl --connect-timeout 10 --silent --show-error --fail --location -O "$binurl{,.sha256,.asc}"
 
@@ -108,28 +108,28 @@ curl --connect-timeout 10 --silent --show-error --fail --location -O "$binurl{,.
 sha256sum -c "${binname}.xz.sha256"
 if [[ -z "${ignore_gpg:-}" ]]; then
   require gpg
-  gpg --keyserver keys.openpgp.org --recv 7C9E68152594688862D62AF62D9AE806EC1592E2
+  gpg --keyserver keys.openpgp.org --recv EB114F5E6C0DC2BCDD183550A4B61A2DC5923710
   gpg --verify "${binname}.xz.asc" "${binname}.xz" || { echo 'Signature does not match'; exit 1; }
 fi
 rm "${binname}".xz.{sha256,asc}
 
 # unpack binary + make executable
 xz --decompress --force "${binname}.xz"
-chown "$giteauser" "$binname"
+chown "$forgejouser" "$binname"
 chmod +x "$binname"
 
-# stop gitea, create backup, replace binary, restart gitea
-echo "Flushing gitea queues at $(date)"
-giteacmd manager flush-queues
-echo "Stopping gitea at $(date)"
+# stop forgejo, create backup, replace binary, restart forgejo
+echo "Flushing forgejo queues at $(date)"
+forgejocmd manager flush-queues
+echo "Stopping forgejo at $(date)"
 $service_stop
-echo "Creating backup in $giteahome"
-giteacmd dump $backupopts
-echo "Updating binary at $giteabin"
-cp -f "$giteabin" "$giteabin.bak" && mv -f "$binname" "$giteabin"
+echo "Creating backup in $forgejohome"
+forgejocmd dump $backupopts
+echo "Updating binary at $forgejobin"
+cp -f "$forgejobin" "$forgejobin.bak" && mv -f "$binname" "$forgejobin"
 $service_start
 $service_status
 
-echo "Upgrade to $giteaversion successful!"
+echo "Upgrade to $forgejoversion successful!"
 
 popd

From 5b380d22d78568c2c4f26a3e8aa90a42006969e9 Mon Sep 17 00:00:00 2001
From: Shiny Nematoda <snematoda@noreply.codeberg.org>
Date: Fri, 19 May 2023 09:08:34 +0000
Subject: [PATCH 22/36] [BRANDING] s/gitea/forgejo/ in HTML placeholders

Replaced Gitea branding with Forgejo for input placeholders

Closes: #686
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/752

(cherry picked from commit 6160d37ca972566017aee46b2ef42f398f969dca)
(cherry picked from commit df61138c7eaa25068fe0012644fd15b407a4816e)
(cherry picked from commit 1f30566c3f63925ca56eaa21b4fa580b4bb1ffaf)
(cherry picked from commit 539bb825f555585f0a52ea4c8747c5b589254633)
(cherry picked from commit bee0f66c869d2632a1ad3cda731caaba74c3634c)
(cherry picked from commit 60ad005c95a6d53f615a720445eef77e4bc499ef)
(cherry picked from commit 282e26222ef4aea1720b4b121ac29264876069c7)
(cherry picked from commit f9ca551f3dbc0f75250445b4e731396dc34fc041)
(cherry picked from commit b2e04b04c381549557873b1956065dc5a5132a97)
(cherry picked from commit c8f395a03c688bcc1413c6ed6b6f820aab7851d5)
(cherry picked from commit 0d58ce49aeefd43b3316c0238dcd04e019b6be25)
(cherry picked from commit c602ddf91efd95347de433cfad8ac20995d12283)
(cherry picked from commit 029e37271ead5405daa11945bd64104f12c8ba77)
(cherry picked from commit fdaa96b3ccca76cba877f8f5dafcf4cf9d160af8)
(cherry picked from commit 515d99e27d5db12c5495e31e104ccb6b7ad0ce7a)
(cherry picked from commit da73274ba1cb55d1c425b95890a55aecee2bb246)
(cherry picked from commit ce90b696a01619d86ac7dac7b0cd78be8f06e4b1)
(cherry picked from commit b6bf98763be1855b5613dc8db627fd889bff8308)
---
 templates/admin/auth/edit.tmpl         | 4 ++--
 templates/admin/auth/source/ldap.tmpl  | 2 +-
 templates/admin/auth/source/oauth.tmpl | 2 +-
 templates/install.tmpl                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 6dfa86d9dd..0b26ddbb0d 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -132,7 +132,7 @@
 						</div>
 						<div class="field">
 							<label>{{.locale.Tr "admin.auths.map_group_to_team"}}</label>
-							<textarea name="group_team_map" rows="5" placeholder='{"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>{{$cfg.GroupTeamMap}}</textarea>
+							<textarea name="group_team_map" rows="5" placeholder='{"cn=my-group,cn=groups,dc=example,dc=org": {"MyForgejoOrganization": ["MyForgejoTeam1", "MyForgejoTeam2"]}}'>{{$cfg.GroupTeamMap}}</textarea>
 						</div>
 						<div class="ui checkbox">
 							<label>{{.locale.Tr "admin.auths.map_group_to_team_removal"}}</label>
@@ -359,7 +359,7 @@
 					</div>
 					<div class="field">
 						<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team"}}</label>
-						<textarea name="oauth2_group_team_map" rows="5" placeholder='{"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>{{$cfg.GroupTeamMap}}</textarea>
+						<textarea name="oauth2_group_team_map" rows="5" placeholder='{"Developer": {"MyForgejoOrganization": ["MyForgejoTeam1", "MyForgejoTeam2"]}}'>{{$cfg.GroupTeamMap}}</textarea>
 					</div>
 					<div class="ui checkbox">
 						<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team_removal"}}</label>
diff --git a/templates/admin/auth/source/ldap.tmpl b/templates/admin/auth/source/ldap.tmpl
index a2bd37be0c..6ecff413b4 100644
--- a/templates/admin/auth/source/ldap.tmpl
+++ b/templates/admin/auth/source/ldap.tmpl
@@ -106,7 +106,7 @@
 		</div>
 		<div class="field">
 			<label>{{.locale.Tr "admin.auths.map_group_to_team"}}</label>
-			<textarea name="group_team_map" rows="5" placeholder='{"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>{{.group_team_map}}</textarea>
+			<textarea name="group_team_map" rows="5" placeholder='{"cn=my-group,cn=groups,dc=example,dc=org": {"MyForgejoOrganization": ["MyForgejoTeam1", "MyForgejoTeam2"]}}'>{{.group_team_map}}</textarea>
 		</div>
 		<div class="ui checkbox">
 			<label>{{.locale.Tr "admin.auths.map_group_to_team_removal"}}</label>
diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl
index aaa8b7fe2d..8e62bdfc5b 100644
--- a/templates/admin/auth/source/oauth.tmpl
+++ b/templates/admin/auth/source/oauth.tmpl
@@ -100,7 +100,7 @@
 	</div>
 	<div class="field">
 		<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team"}}</label>
-		<textarea name="oauth2_group_team_map" rows="5" placeholder='{"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>{{.oauth2_group_team_map}}</textarea>
+		<textarea name="oauth2_group_team_map" rows="5" placeholder='{"Developer": {"MyForgejoOrganization": ["MyForgejoTeam1", "MyForgejoTeam2"]}}'>{{.oauth2_group_team_map}}</textarea>
 	</div>
 	<div class="ui checkbox">
 		<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team_removal"}}</label>
diff --git a/templates/install.tmpl b/templates/install.tmpl
index ac2ba8ec18..82b085280f 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -124,7 +124,7 @@
 					</div>
 					<div class="inline required field">
 						<label for="domain">{{.locale.Tr "install.domain"}}</label>
-						<input id="domain" name="domain" value="{{.domain}}" placeholder="try.gitea.io" required>
+						<input id="domain" name="domain" value="{{.domain}}" placeholder="next.forgejo.org" required>
 						<span class="help">{{.locale.Tr "install.domain_helper"}}</span>
 					</div>
 					<div class="inline field">
@@ -139,7 +139,7 @@
 					</div>
 					<div class="inline required field">
 						<label for="app_url">{{.locale.Tr "install.app_url"}}</label>
-						<input id="app_url" name="app_url" value="{{.app_url}}" placeholder="https://try.gitea.io" required>
+						<input id="app_url" name="app_url" value="{{.app_url}}" placeholder="https://next.forgejo.org" required>
 						<span class="help">{{.locale.Tr "install.app_url_helper"}}</span>
 					</div>
 					<div class="inline required field">

From bf830a0dab534efc33ca5376bccc72ea18e934df Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sat, 27 May 2023 08:13:00 +0200
Subject: [PATCH 23/36] [BRANDING] systemd service Type=simple

The problem is Type=notify - when that is set, systemd waits for a
signal from the service that it's ready so systemctl start forgejo
takes forever (or until it runs into a timeout).

Refs: https://codeberg.org/forgejo/forgejo/issues/777
(cherry picked from commit c127369bba3d36f34ef944679a4c40680cad4d2e)
(cherry picked from commit 883a7eb570d74c4fd7f44396556148ab88d54f58)
(cherry picked from commit 4dfa4c7d210fe33effe26d7a4b74395acd2436b1)
(cherry picked from commit 961163d010e107baf6b30d6da334dc569c1d2f9a)
(cherry picked from commit 6a058126287ed25f8b5a7790dea616d2a5506098)
(cherry picked from commit 112c419f0b365d64a025e56aaa9e424c7256b06a)
(cherry picked from commit f3cd60dee739e09189c3821d07c9330d7c247c57)
(cherry picked from commit 6fccc6bf0b11f973e911e95cb3d005a0c21216ca)
(cherry picked from commit 556862de70314d4c71a5cf60f5637fec673bac48)
(cherry picked from commit eb8e2880f717f84876d7155d20768a95172bf72f)
(cherry picked from commit 264d85330c38bff2590168d9cd149d55588613d6)
(cherry picked from commit 083e66a2b6f00d7b8ff247fd35572dfa13094714)
(cherry picked from commit c1385bca5521e34ac854f13467a57015558d368f)
(cherry picked from commit d61930730d1f89ff9150e89a2809d3d0184d6af8)
(cherry picked from commit cfc815254f56719bbd2c09faa3f3f39f1d9753a9)
(cherry picked from commit 613192ae64fbcfb8f0a10ab6fccd2e227c8e0957)
---
 contrib/systemd/forgejo.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/systemd/forgejo.service b/contrib/systemd/forgejo.service
index 0b8c8cccbf..ce5810b5fa 100644
--- a/contrib/systemd/forgejo.service
+++ b/contrib/systemd/forgejo.service
@@ -52,7 +52,7 @@ After=network.target
 # Uncomment the next line if you have repos with lots of files and get a HTTP 500 error because of that
 # LimitNOFILE=524288:524288
 RestartSec=2s
-Type=notify
+Type=simple
 User=git
 Group=git
 WorkingDirectory=/var/lib/forgejo/

From 07c4ac8a33fd067481d11527df4ee29007ef2f1c Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Fri, 9 Jun 2023 17:49:15 +0200
Subject: [PATCH 24/36] [BRANDING] systemd service trim WatchdogSec=30s

Refs: https://codeberg.org/forgejo/forgejo/issues/777
(cherry picked from commit 11b646dc6a59b3fe3873b8f70d08498e655b5cc1)
(cherry picked from commit e37847b9e689405a414d05a9875a28fadfde0910)
(cherry picked from commit 794aa9dbc8d6e8739b709f138ac7173d02f00a33)
(cherry picked from commit f4d3bfbc0da58505331c8d1060e44be2dbddffbb)
(cherry picked from commit b48faeaf29e783c397bccfd45e62303aa43139da)
(cherry picked from commit 150c44c903c7d77733836947e6829560816eb3ae)
(cherry picked from commit f1b4bc7c908045b58655196f86a28843c6e30cc1)
(cherry picked from commit e1ef3c5a71b22392a96eccf88b00f8ec95fab2bf)
(cherry picked from commit 84399c24e0bd2bfba9cc8a0bdc9c946270c81628)
(cherry picked from commit 8242651ab3ffb4a04e3fe3e35745b7772ab40b03)
(cherry picked from commit 97a13e6a263f41f6d15e18da7260ed70c41e6c28)
(cherry picked from commit 2b00b6477bd2e397c7c5327c3e3e4a8633b3218c)
(cherry picked from commit f3870ed880eced44e1ea7d214cc8a6d2207de0ee)
(cherry picked from commit 4d14ded61108e9d43dfc8da9d779620ea1388004)
---
 contrib/systemd/forgejo.service | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contrib/systemd/forgejo.service b/contrib/systemd/forgejo.service
index ce5810b5fa..04ef69adc0 100644
--- a/contrib/systemd/forgejo.service
+++ b/contrib/systemd/forgejo.service
@@ -62,7 +62,6 @@ WorkingDirectory=/var/lib/forgejo/
 ExecStart=/usr/local/bin/forgejo web --config /etc/forgejo/app.ini
 Restart=always
 Environment=USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/forgejo
-WatchdogSec=30s
 # If you install Git to directory prefix other than default PATH (which happens
 # for example if you install other versions of Git side-to-side with
 # distribution version), uncomment below line and add that prefix to PATH

From 312a6b92f384fdb09fc26e5da5a4acf0680ff698 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sun, 11 Jun 2023 09:31:34 +0200
Subject: [PATCH 25/36] [BRANDING] How to start a runner: URL to Actions admin
 documentation

(cherry picked from commit da91799e6f06ac3c91c1cfc763f4ec0b5cc3cf21)
(cherry picked from commit 28231663b634f6d877173ba4956f6c0a5d128b2b)
(cherry picked from commit 533a90345bb0236c8fc088f2ab1b92535f8a4269)
(cherry picked from commit 6a0e4e55dd02beff179b8503259d1cc774e8e81b)
(cherry picked from commit f47cd611c68f9da2df9b0e5e0a8332f6fcc17932)
(cherry picked from commit 001264b7840aaad6aa25e0b06a927300751ef20e)
(cherry picked from commit e4099e9bb9f557e99bb0117eaf6ad88467684527)
(cherry picked from commit 3a1885649ff1dcaf5acdb1bb237c477a92aeb01f)
(cherry picked from commit c42802c710c0fce2eea06a93a7f4373557515616)
(cherry picked from commit a611ce8d6d293573534d4ce1efde81d32129723a)
(cherry picked from commit a3d7d10a80ba6104ee6f260290518936b210c16b)
(cherry picked from commit 52adde671f8dcb309235506a3c39a38db87e9537)
(cherry picked from commit c9a3820fef10ef0b20e52f5f70d7794dde0974b3)
(cherry picked from commit dce40997c956244742325b5b10d13e8ec918082c)
---
 templates/shared/actions/runner_list.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl
index c4b70282ae..8bd42d1da2 100644
--- a/templates/shared/actions/runner_list.tmpl
+++ b/templates/shared/actions/runner_list.tmpl
@@ -11,7 +11,7 @@
 				<div class="menu">
 					<div class="item">
 						{{/* TODO: replece the document link when there's a better one than the README of act_runner */}}
-						<a href="https://gitea.com/gitea/act_runner/src/branch/main/README.md">{{.locale.Tr "actions.runners.new_notice"}}</a>
+						<a href="https://forgejo.org/docs/next/admin/actions/#forgejo-runner">{{.locale.Tr "actions.runners.new_notice"}}</a>
 					</div>
 					<div class="divider"></div>
 					<div class="header">

From 1bd8eab96db30c4690d7f39c9585d9edcbb80032 Mon Sep 17 00:00:00 2001
From: Gusted <postmaster@gusted.xyz>
Date: Sun, 18 Jun 2023 20:34:26 +0200
Subject: [PATCH 26/36] [BRANDING] Use `forgejo` binary name

- Use `forgejo` binary name for migration suggestions.
- Resolves https://codeberg.org/forgejo/forgejo/issues/869#issuecomment-944501

(cherry picked from commit 418a0bed8f831b72b206ca415d99c99824bec839)
(cherry picked from commit 734579ce9b0f66b61b4a08f605695af9db1d4f4e)
(cherry picked from commit 34bce5be193505cfc58a115dcd42a5d5912cb250)
(cherry picked from commit 9c788a6ec03ab413fc346386a6db846d1ca3b3e2)
(cherry picked from commit 6cabe323115d3e56f0eab1fe1d9eb384e32486d5)
(cherry picked from commit eba83a24408d40a922aee168ab7518fda0d488bb)
(cherry picked from commit 271c4586b2f2d88c8abcb3a514e02d579ee0fdb6)
(cherry picked from commit 60883a4d68e0d15faec91df3a88644f5a4761ac5)
(cherry picked from commit ec1f866ccb22fba03ebdabb2a09fb149c9efcd4a)
(cherry picked from commit 3689fbe53c426e7bd728ba35c0c744b952c93298)
(cherry picked from commit 8019b115b640d744233b9652efc8895294ad4103)
(cherry picked from commit 0d565d655b282382f910e6a6b74808852ebc6c0f)
(cherry picked from commit b3f72a1e118da558bfc72cc2ba42adb38f7b2e4b)
---
 models/migrations/migrations.go | 2 +-
 routers/common/db.go            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 0697d84083..24620350f9 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -576,7 +576,7 @@ func EnsureUpToDate(x *xorm.Engine) error {
 	expected := ExpectedVersion()
 
 	if currentDB != expected {
-		return fmt.Errorf(`Current database version %d is not equal to the expected version %d. Please run "gitea [--config /path/to/app.ini] migrate" to update the database version`, currentDB, expected)
+		return fmt.Errorf(`Current database version %d is not equal to the expected version %d. Please run "forgejo [--config /path/to/app.ini] migrate" to update the database version`, currentDB, expected)
 	}
 
 	return nil
diff --git a/routers/common/db.go b/routers/common/db.go
index 2e86fbd0fd..5ce09d88e4 100644
--- a/routers/common/db.go
+++ b/routers/common/db.go
@@ -51,7 +51,7 @@ func migrateWithSetting(x *xorm.Engine) error {
 		return migrations.Migrate(x)
 	} else if expected := migrations.ExpectedVersion(); current != expected {
 		log.Fatal(`"database.AUTO_MIGRATION" is disabled, but current database version %d is not equal to the expected version %d.`+
-			`You can set "database.AUTO_MIGRATION" to true or migrate manually by running "gitea [--config /path/to/app.ini] migrate"`, current, expected)
+			`You can set "database.AUTO_MIGRATION" to true or migrate manually by running "forgejo [--config /path/to/app.ini] migrate"`, current, expected)
 	}
 	return nil
 }

From 7d60a6f5116124b72927a52db0dd36af7a9c3621 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Mon, 10 Jul 2023 23:17:39 +0200
Subject: [PATCH 27/36] [BRANDING] parse FORGEJO__* in the container
 environment

(cherry picked from commit b0759917479ee17ccb11773176dbc8a75323c5cb)
(cherry picked from commit da3f76228e24d2276784ad7e1a03a34d094750e0)
(cherry picked from commit 20d196e74f9d7827cd812e3eb714eb87e888b6db)
(cherry picked from commit 0bf8b1824eac416ddb40fd2e0d7605573ba087a3)
(cherry picked from commit 655bb770a7cf65ada5d3e214ec23219e6cb19df0)
(cherry picked from commit d69d5c2c46f00b041beeb67a6238c5193ce9710a)
(cherry picked from commit 00b55e5a5396a49a6798a3ae2588e412637a77c6)
(cherry picked from commit 456121fd8a4c0c30f7854bd04907f2a0a583d27f)
(cherry picked from commit 9716a158e48ad6333f46fc0806a838603606e5ea)
---
 contrib/environment-to-ini/environment-to-ini.go | 12 ++++++------
 modules/setting/config_env.go                    | 16 +++++++++-------
 modules/setting/config_env_test.go               |  9 ++++++++-
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/contrib/environment-to-ini/environment-to-ini.go b/contrib/environment-to-ini/environment-to-ini.go
index 7758045fd3..4cdda2b2b3 100644
--- a/contrib/environment-to-ini/environment-to-ini.go
+++ b/contrib/environment-to-ini/environment-to-ini.go
@@ -16,15 +16,15 @@ func main() {
 	app := cli.NewApp()
 	app.Name = "environment-to-ini"
 	app.Usage = "Use provided environment to update configuration ini"
-	app.Description = `As a helper to allow docker users to update the gitea configuration
+	app.Description = `As a helper to allow docker users to update the forgejo configuration
 	through the environment, this command allows environment variables to
 	be mapped to values in the ini.
 
-	Environment variables of the form "GITEA__SECTION_NAME__KEY_NAME"
+	Environment variables of the form "FORGEJO__SECTION_NAME__KEY_NAME"
 	will be mapped to the ini section "[section_name]" and the key
 	"KEY_NAME" with the value as provided.
 
-	Environment variables of the form "GITEA__SECTION_NAME__KEY_NAME__FILE"
+	Environment variables of the form "FORGEJO__SECTION_NAME__KEY_NAME__FILE"
 	will be mapped to the ini section "[section_name]" and the key
 	"KEY_NAME" with the value loaded from the specified file.
 
@@ -42,8 +42,8 @@ func main() {
 		...
 		"""
 
-	You would set the environment variables: "GITEA__LOG_0x2E_CONSOLE__COLORIZE=false"
-	and "GITEA__LOG_0x2E_CONSOLE__STDERR=false". Other examples can be found
+	You would set the environment variables: "FORGEJO__LOG_0x2E_CONSOLE__COLORIZE=false"
+	and "FORGEJO__LOG_0x2E_CONSOLE__STDERR=false". Other examples can be found
 	on the configuration cheat sheet.`
 	app.Flags = []cli.Flag{
 		&cli.StringFlag{
@@ -59,7 +59,7 @@ func main() {
 		&cli.StringFlag{
 			Name:  "work-path, w",
 			Value: setting.AppWorkPath,
-			Usage: "Set the gitea working path",
+			Usage: "Set the forgejo working path",
 		},
 		&cli.StringFlag{
 			Name:  "out, o",
diff --git a/modules/setting/config_env.go b/modules/setting/config_env.go
index b30e44de30..137dfaa385 100644
--- a/modules/setting/config_env.go
+++ b/modules/setting/config_env.go
@@ -14,7 +14,7 @@ import (
 )
 
 const (
-	EnvConfigKeyPrefixGitea = "GITEA__"
+	EnvConfigKeyPrefixGitea = "^(FORGEJO|GITEA)__"
 	EnvConfigKeySuffixFile  = "__FILE"
 )
 
@@ -97,19 +97,21 @@ func decodeEnvSectionKey(encoded string) (ok bool, section, key string) {
 
 // decodeEnvironmentKey decode the environment key to section and key
 // The environment key is in the form of GITEA__SECTION__KEY or GITEA__SECTION__KEY__FILE
-func decodeEnvironmentKey(prefixGitea, suffixFile, envKey string) (ok bool, section, key string, useFileValue bool) {
-	if !strings.HasPrefix(envKey, prefixGitea) {
-		return false, "", "", false
-	}
+func decodeEnvironmentKey(prefixRegexp *regexp.Regexp, suffixFile, envKey string) (ok bool, section, key string, useFileValue bool) {
 	if strings.HasSuffix(envKey, suffixFile) {
 		useFileValue = true
 		envKey = envKey[:len(envKey)-len(suffixFile)]
 	}
-	ok, section, key = decodeEnvSectionKey(envKey[len(prefixGitea):])
+	loc := prefixRegexp.FindStringIndex(envKey)
+	if loc == nil {
+		return false, "", "", false
+	}
+	ok, section, key = decodeEnvSectionKey(envKey[loc[1]:])
 	return ok, section, key, useFileValue
 }
 
 func EnvironmentToConfig(cfg ConfigProvider, envs []string) (changed bool) {
+	prefixRegexp := regexp.MustCompile(EnvConfigKeyPrefixGitea)
 	for _, kv := range envs {
 		idx := strings.IndexByte(kv, '=')
 		if idx < 0 {
@@ -119,7 +121,7 @@ func EnvironmentToConfig(cfg ConfigProvider, envs []string) (changed bool) {
 		// parse the environment variable to config section name and key name
 		envKey := kv[:idx]
 		envValue := kv[idx+1:]
-		ok, sectionName, keyName, useFileValue := decodeEnvironmentKey(EnvConfigKeyPrefixGitea, EnvConfigKeySuffixFile, envKey)
+		ok, sectionName, keyName, useFileValue := decodeEnvironmentKey(prefixRegexp, EnvConfigKeySuffixFile, envKey)
 		if !ok {
 			continue
 		}
diff --git a/modules/setting/config_env_test.go b/modules/setting/config_env_test.go
index e14d5ecb41..adeb17244d 100644
--- a/modules/setting/config_env_test.go
+++ b/modules/setting/config_env_test.go
@@ -5,6 +5,7 @@ package setting
 
 import (
 	"os"
+	"regexp"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -33,7 +34,7 @@ func TestDecodeEnvSectionKey(t *testing.T) {
 }
 
 func TestDecodeEnvironmentKey(t *testing.T) {
-	prefix := "GITEA__"
+	prefix := regexp.MustCompile(EnvConfigKeyPrefixGitea)
 	suffix := "__FILE"
 
 	ok, section, key, file := decodeEnvironmentKey(prefix, suffix, "SEC__KEY")
@@ -60,6 +61,12 @@ func TestDecodeEnvironmentKey(t *testing.T) {
 	assert.Equal(t, "KEY", key)
 	assert.False(t, file)
 
+	ok, section, key, file = decodeEnvironmentKey(prefix, suffix, "FORGEJO__SEC__KEY")
+	assert.True(t, ok)
+	assert.Equal(t, "sec", section)
+	assert.Equal(t, "KEY", key)
+	assert.False(t, file)
+
 	// with "__FILE" suffix, it doesn't support to write "[sec].FILE" to config (no such key FILE is used in Gitea)
 	// but it could be fixed in the future by adding a new suffix like "__VALUE" (no such key VALUE is used in Gitea either)
 	ok, section, key, file = decodeEnvironmentKey(prefix, suffix, "GITEA__SEC__FILE")

From 56a437b29b71976b9b0816d0de2ce8169a84f288 Mon Sep 17 00:00:00 2001
From: Gusted <postmaster@gusted.xyz>
Date: Wed, 19 Jul 2023 19:41:14 +0200
Subject: [PATCH 28/36] [BRANDING] package templates & links

- Change Gitea to Forgejo where necessary.
- Point all documentation to Forgejo's documentation.
- Resolves #992

(cherry picked from commit d0b78a6edea0abba54ef537781234d8f778e0ad8)
(cherry picked from commit e2382f30ba07586fd3ea4c8a535ab550ecc33408)
(cherry picked from commit c41cf05a334944a66129425c4a9abb973fbb4687)
(cherry picked from commit 797e598ae73441c66f25849bf643e0c11a737c41)
(cherry picked from commit 970031a1c2974cf0c6ce057ad82afdd6380f6882)
(cherry picked from commit 0c1180e2e142852248787185e2c01582413de8c3)

Conflicts:
	templates/package/content/alpine.tmpl
	templates/package/content/cargo.tmpl
	templates/package/content/chef.tmpl
	templates/package/content/composer.tmpl
	templates/package/content/conan.tmpl
	templates/package/content/conda.tmpl
	templates/package/content/container.tmpl
	templates/package/content/cran.tmpl
	templates/package/content/debian.tmpl
	templates/package/content/generic.tmpl
	templates/package/content/go.tmpl
	templates/package/content/helm.tmpl
	templates/package/content/maven.tmpl
	templates/package/content/npm.tmpl
	templates/package/content/nuget.tmpl
	templates/package/content/pub.tmpl
	templates/package/content/pypi.tmpl
	templates/package/content/rpm.tmpl
	templates/package/content/rubygems.tmpl
	templates/package/content/swift.tmpl
	templates/package/content/vagrant.tmpl

	https://codeberg.org/forgejo/forgejo/pulls/1351
(cherry picked from commit 42ac9ff2abe55826047c36e041f1bcd70caf7581)
(cherry picked from commit e390000bcee673c2d15c8777c2d2da316967ce62)
---
 templates/package/content/alpine.tmpl    | 2 +-
 templates/package/content/cargo.tmpl     | 6 +++---
 templates/package/content/chef.tmpl      | 2 +-
 templates/package/content/composer.tmpl  | 2 +-
 templates/package/content/conan.tmpl     | 4 ++--
 templates/package/content/conda.tmpl     | 2 +-
 templates/package/content/container.tmpl | 2 +-
 templates/package/content/cran.tmpl      | 4 ++--
 templates/package/content/debian.tmpl    | 6 +++---
 templates/package/content/generic.tmpl   | 2 +-
 templates/package/content/go.tmpl        | 2 +-
 templates/package/content/helm.tmpl      | 2 +-
 templates/package/content/maven.tmpl     | 2 +-
 templates/package/content/npm.tmpl       | 2 +-
 templates/package/content/nuget.tmpl     | 2 +-
 templates/package/content/pub.tmpl       | 2 +-
 templates/package/content/pypi.tmpl      | 2 +-
 templates/package/content/rpm.tmpl       | 2 +-
 templates/package/content/rubygems.tmpl  | 2 +-
 templates/package/content/swift.tmpl     | 2 +-
 templates/package/content/vagrant.tmpl   | 2 +-
 templates/package/shared/cargo.tmpl      | 2 +-
 templates/package/shared/list.tmpl       | 2 +-
 templates/user/settings/packages.tmpl    | 2 +-
 24 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/templates/package/content/alpine.tmpl b/templates/package/content/alpine.tmpl
index fa34f82140..395aef9ac4 100644
--- a/templates/package/content/alpine.tmpl
+++ b/templates/package/content/alpine.tmpl
@@ -18,7 +18,7 @@
 				</div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Alpine" "https://docs.gitea.com/usage/packages/alpine/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Alpine" "https://forgejo.org/docs/latest/user/packages/alpine/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/cargo.tmpl b/templates/package/content/cargo.tmpl
index b7a34632e4..e7721bfd61 100644
--- a/templates/package/content/cargo.tmpl
+++ b/templates/package/content/cargo.tmpl
@@ -5,9 +5,9 @@
 			<div class="field">
 				<label>{{svg "octicon-code"}} {{.locale.Tr "packages.cargo.registry" | Safe}}</label>
 				<div class="markup"><pre class="code-block"><code>[registry]
-default = "gitea"
+default = "forgejo"
 
-[registries.gitea]
+[registries.forgejo]
 index = "<gitea-origin-url data-url="{{AppSubUrl}}/{{.PackageDescriptor.Owner.Name}}/_cargo-index.git"></gitea-origin-url>"
 
 [net]
@@ -18,7 +18,7 @@ git-fetch-with-cli = true</code></pre></div>
 				<div class="markup"><pre class="code-block"><code>cargo add {{.PackageDescriptor.Package.Name}}@{{.PackageDescriptor.Version.Version}}</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Cargo" "https://docs.gitea.com/usage/packages/cargo/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Cargo" "https://forgejo.org/docs/latest/user/packages/cargo/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/chef.tmpl b/templates/package/content/chef.tmpl
index 2596f8d493..7e88d39d3b 100644
--- a/templates/package/content/chef.tmpl
+++ b/templates/package/content/chef.tmpl
@@ -11,7 +11,7 @@
 				<div class="markup"><pre class="code-block"><code>knife supermarket install {{.PackageDescriptor.Package.Name}} {{.PackageDescriptor.Version.Version}}</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Chef" "https://docs.gitea.com/usage/packages/chef/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Chef" "https://forgejo.org/docs/latest/user/packages/chef/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/composer.tmpl b/templates/package/content/composer.tmpl
index 80997c583f..117f97fa50 100644
--- a/templates/package/content/composer.tmpl
+++ b/templates/package/content/composer.tmpl
@@ -17,7 +17,7 @@
 				<div class="markup"><pre class="code-block"><code>composer require {{.PackageDescriptor.Package.Name}}:{{.PackageDescriptor.Version.Version}}</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Composer" "https://docs.gitea.com/usage/packages/composer/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Composer" "https://forgejo.org/docs/latest/user/packages/composer/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/conan.tmpl b/templates/package/content/conan.tmpl
index c8904216af..179031d73a 100644
--- a/templates/package/content/conan.tmpl
+++ b/templates/package/content/conan.tmpl
@@ -8,10 +8,10 @@
 			</div>
 			<div class="field">
 				<label>{{svg "octicon-terminal"}} {{.locale.Tr "packages.conan.install"}}</label>
-				<div class="markup"><pre class="code-block"><code>conan install --remote=gitea {{.PackageDescriptor.Package.Name}}/{{.PackageDescriptor.Version.Version}}</code></pre></div>
+				<div class="markup"><pre class="code-block"><code>conan install --remote=forgejo {{.PackageDescriptor.Package.Name}}/{{.PackageDescriptor.Version.Version}}</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Conan" "https://docs.gitea.com/usage/packages/conan/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Conan" "https://forgejo.org/docs/latest/user/packages/conan/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/conda.tmpl b/templates/package/content/conda.tmpl
index 23d640944b..17d20b30ed 100644
--- a/templates/package/content/conda.tmpl
+++ b/templates/package/content/conda.tmpl
@@ -16,7 +16,7 @@ default_channels:
 				<div class="markup"><pre class="code-block"><code>conda install{{if $channel}} -c {{$channel}}{{end}} {{.PackageDescriptor.PackageProperties.GetByName "conda.name"}}={{.PackageDescriptor.Version.Version}}</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Conda" "https://docs.gitea.com/usage/packages/conda/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Conda" "https://forgejo.org/docs/latest/user/packages/conda/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/container.tmpl b/templates/package/content/container.tmpl
index cba5d9e7c1..47e3de1414 100644
--- a/templates/package/content/container.tmpl
+++ b/templates/package/content/container.tmpl
@@ -19,7 +19,7 @@
 				<div class="markup"><pre class="code-block"><code>{{range .PackageDescriptor.Files}}{{if eq .File.LowerName "manifest.json"}}{{.Properties.GetByName "container.digest"}}{{end}}{{end}}</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Container" "https://docs.gitea.com/usage/packages/container/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Container" "https://forgejo.org/docs/latest/user/packages/container/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/cran.tmpl b/templates/package/content/cran.tmpl
index 1f3200130c..62d5c72396 100644
--- a/templates/package/content/cran.tmpl
+++ b/templates/package/content/cran.tmpl
@@ -4,14 +4,14 @@
 		<div class="ui form">
 			<div class="field">
 				<label>{{svg "octicon-code"}} {{.locale.Tr "packages.cran.registry" | Safe}}</label>
-				<div class="markup"><pre class="code-block"><code>options("repos" = c(getOption("repos"), c(gitea="<gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/cran"></gitea-origin-url>")))</code></pre></div>
+				<div class="markup"><pre class="code-block"><code>options("repos" = c(getOption("repos"), c(forgejo="<gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/cran"></gitea-origin-url>")))</code></pre></div>
 			</div>
 			<div class="field">
 				<label>{{svg "octicon-terminal"}} {{.locale.Tr "packages.cran.install"}}</label>
 				<div class="markup"><pre class="code-block"><code>install.packages("{{.PackageDescriptor.Package.Name}}")</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "CRAN" "https://docs.gitea.com/usage/packages/cran/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "CRAN" "https://forgejo.org/docs/latest/user/packages/cran/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/debian.tmpl b/templates/package/content/debian.tmpl
index b222767035..b57e430096 100644
--- a/templates/package/content/debian.tmpl
+++ b/templates/package/content/debian.tmpl
@@ -4,8 +4,8 @@
 		<div class="ui form">
 			<div class="field">
 				<label>{{svg "octicon-terminal"}} {{.locale.Tr "packages.debian.registry"}}</label>
-				<div class="markup"><pre class="code-block"><code>sudo curl <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/debian/repository.key"></gitea-origin-url> -o /etc/apt/trusted.gpg.d/gitea-{{$.PackageDescriptor.Owner.Name}}.asc
-echo "deb <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/debian"></gitea-origin-url> $distribution $component" | sudo tee -a /etc/apt/sources.list.d/gitea.list
+				<div class="markup"><pre class="code-block"><code>sudo curl <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/debian/repository.key"></gitea-origin-url> -o /etc/apt/trusted.gpg.d/forgejo-{{$.PackageDescriptor.Owner.Name}}.asc
+echo "deb <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/debian"></gitea-origin-url> $distribution $component" | sudo tee -a /etc/apt/sources.list.d/forgejo.list
 sudo apt update</code></pre></div>
 				<p>{{.locale.Tr "packages.debian.registry.info" | Safe}}</p>
 			</div>
@@ -16,7 +16,7 @@ sudo apt update</code></pre></div>
 				</div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Debian" "https://docs.gitea.com/usage/packages/debian/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Debian" "https://forgejo.org/docs/latest/user/packages/debian/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/generic.tmpl b/templates/package/content/generic.tmpl
index 01012a5f0a..e5093a4e56 100644
--- a/templates/package/content/generic.tmpl
+++ b/templates/package/content/generic.tmpl
@@ -11,7 +11,7 @@ curl <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescripto
 				</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Generic" "https://docs.gitea.com/usage/packages/generic" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Generic" "https://forgejo.org/docs/latest/user/packages/generic/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/go.tmpl b/templates/package/content/go.tmpl
index db25cc2b92..1bcfc4fee8 100644
--- a/templates/package/content/go.tmpl
+++ b/templates/package/content/go.tmpl
@@ -7,7 +7,7 @@
 				<div class="markup"><pre class="code-block"><code>GOPROXY=<gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/go"></gitea-origin-url> go install {{$.PackageDescriptor.Package.Name}}@{{$.PackageDescriptor.Version.Version}}</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Go" "https://docs.gitea.com/usage/packages/go" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Go" "https://forgejo.org/docs/latest/user/packages/go/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/helm.tmpl b/templates/package/content/helm.tmpl
index 44d01b6013..58ef7e1bfd 100644
--- a/templates/package/content/helm.tmpl
+++ b/templates/package/content/helm.tmpl
@@ -12,7 +12,7 @@ helm repo update</code></pre></div>
 				<div class="markup"><pre class="code-block"><code>helm install {{.PackageDescriptor.Package.Name}} {{AppDomain}}/{{.PackageDescriptor.Package.Name}}</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Helm" "https://docs.gitea.com/usage/packages/helm/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Helm" "https://forgejo.org/docs/latest/user/packages/helm/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/maven.tmpl b/templates/package/content/maven.tmpl
index f5da72d711..7aa8dc9b18 100644
--- a/templates/package/content/maven.tmpl
+++ b/templates/package/content/maven.tmpl
@@ -40,7 +40,7 @@
 				<div class="markup"><pre class="code-block"><code>mvn dependency:get -DremoteRepositories=<gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/maven"></gitea-origin-url> -Dartifact={{.PackageDescriptor.Metadata.GroupID}}:{{.PackageDescriptor.Metadata.ArtifactID}}:{{.PackageDescriptor.Version.Version}}</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Maven" "https://docs.gitea.com/usage/packages/maven/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Maven" "https://forgejo.org/docs/latest/user/packages/maven/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/npm.tmpl b/templates/package/content/npm.tmpl
index c648d96162..5b68e3c878 100644
--- a/templates/package/content/npm.tmpl
+++ b/templates/package/content/npm.tmpl
@@ -15,7 +15,7 @@
 				<div class="markup"><pre class="code-block"><code>&quot;{{.PackageDescriptor.Package.Name}}&quot;: &quot;{{.PackageDescriptor.Version.Version}}&quot;</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "npm" "https://docs.gitea.com/usage/packages/npm/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "npm" "https://forgejo.org/docs/latest/user/packages/npm/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/nuget.tmpl b/templates/package/content/nuget.tmpl
index 2b3a74316c..dfafc83bd4 100644
--- a/templates/package/content/nuget.tmpl
+++ b/templates/package/content/nuget.tmpl
@@ -11,7 +11,7 @@
 				<div class="markup"><pre class="code-block"><code>dotnet add package --source {{.PackageDescriptor.Owner.Name}} --version {{.PackageDescriptor.Version.Version}} {{.PackageDescriptor.Package.Name}}</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "NuGet" "https://docs.gitea.com/usage/packages/nuget/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "NuGet" "https://forgejo.org/docs/latest/user/packages/nuget/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/pub.tmpl b/templates/package/content/pub.tmpl
index 075d52cf49..fbe8e6f660 100644
--- a/templates/package/content/pub.tmpl
+++ b/templates/package/content/pub.tmpl
@@ -7,7 +7,7 @@
 				<div class="markup"><pre class="code-block"><code>dart pub add {{.PackageDescriptor.Package.Name}}:{{.PackageDescriptor.Version.Version}} --hosted-url=<gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/pub/"></gitea-origin-url></code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Pub" "https://docs.gitea.com/usage/packages/pub/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Pub" "https://forgejo.org/docs/latest/user/packages/pub/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/pypi.tmpl b/templates/package/content/pypi.tmpl
index 1534197219..3c7740eb45 100644
--- a/templates/package/content/pypi.tmpl
+++ b/templates/package/content/pypi.tmpl
@@ -7,7 +7,7 @@
 				<div class="markup"><pre class="code-block"><code>pip install --index-url <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/pypi/simple/"></gitea-origin-url> {{.PackageDescriptor.Package.Name}}</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "PyPI" "https://docs.gitea.com/usage/packages/pypi/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "PyPI" "https://forgejo.org/docs/latest/user/packages/pypi/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/rpm.tmpl b/templates/package/content/rpm.tmpl
index fc7af639aa..bdf72dae2b 100644
--- a/templates/package/content/rpm.tmpl
+++ b/templates/package/content/rpm.tmpl
@@ -21,7 +21,7 @@ zypper install {{$.PackageDescriptor.Package.Name}}</code></pre>
 				</div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "RPM" "https://docs.gitea.com/usage/packages/rpm/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "RPM" "https://forgejo.org/docs/latest/user/packages/rpm/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/rubygems.tmpl b/templates/package/content/rubygems.tmpl
index f94968b094..007b6069e3 100644
--- a/templates/package/content/rubygems.tmpl
+++ b/templates/package/content/rubygems.tmpl
@@ -13,7 +13,7 @@
 end</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "RubyGems" "https://docs.gitea.com/usage/packages/rubygems/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "RubyGems" "https://forgejo.org/docs/latest/user/packages/rubygems/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/swift.tmpl b/templates/package/content/swift.tmpl
index 92559491a9..64ea8de840 100644
--- a/templates/package/content/swift.tmpl
+++ b/templates/package/content/swift.tmpl
@@ -17,7 +17,7 @@
 				<div class="markup"><pre class="code-block"><code>swift package resolve</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Swift" "https://docs.gitea.com/usage/packages/swift/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Swift" "https://forgejo.org/docs/latest/user/packages/swift/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/content/vagrant.tmpl b/templates/package/content/vagrant.tmpl
index 8590b44b37..f1843239d5 100644
--- a/templates/package/content/vagrant.tmpl
+++ b/templates/package/content/vagrant.tmpl
@@ -7,7 +7,7 @@
 				<div class="markup"><pre class="code-block"><code>vagrant box add --box-version {{.PackageDescriptor.Version.Version}} "<gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/vagrant/{{.PackageDescriptor.Package.Name}}"></gitea-origin-url>"</code></pre></div>
 			</div>
 			<div class="field">
-				<label>{{.locale.Tr "packages.registry.documentation" "Vagrant" "https://docs.gitea.com/usage/packages/vagrant/" | Safe}}</label>
+				<label>{{.locale.Tr "packages.registry.documentation" "Vagrant" "https://forgejo.org/docs/latest/user/packages/vagrant/" | Safe}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/shared/cargo.tmpl b/templates/package/shared/cargo.tmpl
index 8831cd8988..faf0f8d80e 100644
--- a/templates/package/shared/cargo.tmpl
+++ b/templates/package/shared/cargo.tmpl
@@ -18,7 +18,7 @@
 			<button class="ui green button">{{$.locale.Tr "packages.owner.settings.cargo.rebuild"}}</button>
 		</form>
 		<div class="field">
-			<label>{{.locale.Tr "packages.registry.documentation" "Cargo" "https://docs.gitea.com/usage/packages/cargo/" | Safe}}</label>
+			<label>{{.locale.Tr "packages.registry.documentation" "Cargo" "https://forgejo.org/docs/latest/user/packages/cargo/" | Safe}}</label>
 		</div>
 	</div>
 </div>
diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl
index afa360fd93..35dab8c695 100644
--- a/templates/package/shared/list.tmpl
+++ b/templates/package/shared/list.tmpl
@@ -45,7 +45,7 @@
 					{{$packagesUrl := URLJoin .Owner.HomeLink "-" "packages"}}
 					<p>{{.locale.Tr "packages.empty.repo" $packagesUrl | Safe}}</p>
 				{{end}}
-				<p>{{.locale.Tr "packages.empty.documentation" "https://docs.gitea.com/usage/packages/overview/" | Safe}}</p>
+				<p>{{.locale.Tr "packages.empty.documentation" "https://forgejo.org/docs/latest/user/packages/" | Safe}}</p>
 			</div>
 		{{else}}
 			<p class="gt-py-4">{{.locale.Tr "packages.filter.no_result"}}</p>
diff --git a/templates/user/settings/packages.tmpl b/templates/user/settings/packages.tmpl
index 304940feb8..f55ccc8e61 100644
--- a/templates/user/settings/packages.tmpl
+++ b/templates/user/settings/packages.tmpl
@@ -16,7 +16,7 @@
 					<button class="ui green button">{{$.locale.Tr "packages.owner.settings.chef.keypair"}}</button>
 				</form>
 				<div class="field">
-					<label>{{.locale.Tr "packages.registry.documentation" "Chef" "https://docs.gitea.com/usage/packages/chef/" | Safe}}</label>
+					<label>{{.locale.Tr "packages.registry.documentation" "Chef" "https://forgejo.org/docs/latest/user/packages/chef/" | Safe}}</label>
 				</div>
 			</div>
 		</div>

From 8baab7c0c1b826884b02649ec5ccf34d01f0e9d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Dachary?= <loic@dachary.org>
Date: Fri, 21 Jul 2023 11:36:24 +0200
Subject: [PATCH 29/36] [BRANDING] add forgejo target to Makefile

The gitea target is kept as is, for the sake of compatibility with
build systems that rely on it. The forgejo target creates a hard link
with forgejo.

(cherry picked from commit ce156c7cb4265e3d94ad41db26d6a5be9667200e)
(cherry picked from commit b2cb23282534cfdf756fcce3e494be756841a9d1)
(cherry picked from commit 85543c22bdd3cf268c77055f644dad42ff4f456e)
(cherry picked from commit 302955a20d3130ef83458810ca6368c612c0a76f)
(cherry picked from commit 4b1be0858ef652ad79c69c1d6331884408cbc2cb)
(cherry picked from commit afed1a6e202386588738a7af08562b9073a5f992)
(cherry picked from commit e81304bcd167c2ca838b2c89db47c44c59a48543)
(cherry picked from commit 479cd51a038b7f98f576dda946595885327082f7)
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 589dd48e1e..25e6db0d87 100644
--- a/Makefile
+++ b/Makefile
@@ -846,6 +846,9 @@ security-check:
 $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
 	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
 
+forgejo: $(EXECUTABLE)
+	ln -f $(EXECUTABLE) forgejo
+
 static-executable: $(GO_SOURCES) $(TAGS_PREREQ)
 	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags 'netgo osusergo $(TAGS)' -ldflags '-s -w -linkmode external -extldflags "-static" $(LDFLAGS)' -o $(EXECUTABLE)
 

From b325b2653faa5e7069b1bf611363e91a6c403390 Mon Sep 17 00:00:00 2001
From: Rodion Borisov <vintprox@envs.net>
Date: Tue, 25 Jul 2023 02:55:51 +0300
Subject: [PATCH 30/36] [BRANDING] Replace links to GitHub with Codeberg guides
 about adding SSH/GPG keys

(cherry picked from commit f409deabe6e45d9300b6195ec37868cdf3e3c65f)
(cherry picked from commit a62a3d0cf6b9a0bd119739c69086f25d61a66bd3)
(cherry picked from commit a28d2ddd5e4a0bff6a911f5c2cf1c4dedbea1fff)
(cherry picked from commit 2f8ac92a1772f388f2b491dab92c097e9271602c)
(cherry picked from commit d43c158a2fc68864898b4a9622462a5becf734ff)
(cherry picked from commit a2fc2dd1e28c9ec555b67c2f0271ab83749ef709)
(cherry picked from commit 00e6fa60d788d84c9a30f0fb3ef9f2ef7fcc5d52)
(cherry picked from commit 350f14bc8a1d88a2b0f9aaec6fbb36ac6fa908c4)

Conflicts:
	templates/user/settings/keys_gpg.tmpl
	templates/user/settings/keys_ssh.tmpl
	https://codeberg.org/forgejo/forgejo/pulls/1420
---
 options/locale/locale_en-US.ini       | 4 ++--
 templates/user/settings/keys_gpg.tmpl | 2 +-
 templates/user/settings/keys_ssh.tmpl | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 932d7311f1..a107a16bd6 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -734,8 +734,8 @@ add_key = Add Key
 ssh_desc = These public SSH keys are associated with your account. The corresponding private keys allow full access to your repositories.
 principal_desc = These SSH certificate principals are associated with your account and allow full access to your repositories.
 gpg_desc = These public GPG keys are associated with your account. Keep your private keys safe as they allow commits to be verified.
-ssh_helper = <strong>Need help?</strong> Have a look at GitHub's guide to <a href="%s">create your own SSH keys</a> or solve <a href="%s">common problems</a> you may encounter using SSH.
-gpg_helper = <strong>Need help?</strong> Have a look at GitHub's guide <a href="%s">about GPG</a>.
+ssh_helper = <strong>Need help?</strong> Have a look at the guide to <a href="%s">create your own SSH keys</a> or solve <a href="%s">common problems</a> you may encounter using SSH.
+gpg_helper = <strong>Need help?</strong> Have a look at the guide <a href="%s">about GPG</a>.
 add_new_key = Add SSH Key
 add_new_gpg_key = Add GPG Key
 key_content_ssh_placeholder = Begins with 'ssh-ed25519', 'ssh-rsa', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', 'ecdsa-sha2-nistp521', 'sk-ecdsa-sha2-nistp256@openssh.com', or 'sk-ssh-ed25519@openssh.com'
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index 2ecebcd7c0..c27d330699 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -43,7 +43,7 @@
 		<div class="flex-item">
 			<p>
 				{{.locale.Tr "settings.gpg_desc"}}<br>
-				{{.locale.Tr "settings.gpg_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification#gpg-commit-signature-verification" | Str2html}}
+				{{.locale.Tr "settings.gpg_helper" "https://docs.codeberg.org/security/gpg-key/" | Str2html}}
 			</p>
 		</div>
 		{{range .GPGKeys}}
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 8419f72ff5..a0f7af0b29 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -31,7 +31,7 @@
 		<div class="flex-item">
 			<p>
 				{{.locale.Tr "settings.ssh_desc"}}<br>
-				{{.locale.Tr "settings.ssh_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/connecting-to-github-with-ssh" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}}
+				{{.locale.Tr "settings.ssh_helper" "https://docs.codeberg.org/security/ssh-key/" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}}
 			</p>
 		</div>
 		{{if .DisableSSH}}

From 30ade1ea0b6de3b634283bd3741b49abf37f9bf0 Mon Sep 17 00:00:00 2001
From: Gusted <postmaster@gusted.xyz>
Date: Sat, 5 Aug 2023 21:58:30 +0200
Subject: [PATCH 31/36] [BRANDING] security.txt

- The [security.txt](https://securitytxt.org/) is a standardized file to
help with reporting security vulnerabilities, by having the most essential
information served at `.well-known/security.txt`.
- Brand this file to point to the Forgejo security team.
- Resolves https://codeberg.org/forgejo/forgejo/issues/1192

(cherry picked from commit 7ca1d0ec87bc23881f59ce3ea04390bf508ec0fa)
(cherry picked from commit ba974b016199cd279b8c7aca76a936910e9f4d69)
(cherry picked from commit 966fbcdcfdc8027aa31fe46eafa229854fe120ad)
(cherry picked from commit 8b9efebc6e5a211b64b003284bf3bb8c66c85662)
(cherry picked from commit 91b1c84c1873b6e07ff7e700429a4fc6f6c1e3bf)
---
 public/.well-known/security.txt | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/.well-known/security.txt b/public/.well-known/security.txt
index 2cae3cbea4..f301a00542 100644
--- a/public/.well-known/security.txt
+++ b/public/.well-known/security.txt
@@ -1,6 +1,8 @@
-# This site is running a Gitea instance.
-# Gitea related security problems could be reported to Gitea community.
-# Site related security problems should be reported to this site's admin.
-Contact: https://github.com/go-gitea/gitea/blob/main/SECURITY.md
-Policy: https://github.com/go-gitea/gitea/blob/main/SECURITY.md
+# This site is running a Forgejo instance.
+# Forgejo-related security problems should be reported to the Forgejo security team.
+# Site-related security problems should be reported to this site's admin.
+Policy: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/CONTRIBUTING.md
+Contact: mailto:security@forgejo.org
+Encryption: https://keys.openpgp.org/vks/v1/by-fingerprint/1B638BDF10969D627926B8D9F585D0F99E1FB56F
 Preferred-Languages: en
+Expires: 2025-06-25T00:00:00Z

From 191d96afe4198d3b6498aa21eaeb7686a59865bc Mon Sep 17 00:00:00 2001
From: Gusted <postmaster@gusted.xyz>
Date: Wed, 9 Aug 2023 15:12:01 +0200
Subject: [PATCH 32/36] [BRANDING] Docker readme

- Modify the README of the docker directory to point to the relevant
docker files and documentation for Forgejo.

(cherry picked from commit aca6371215c1bf95b6c0b19b9fadb797544adc48)
(cherry picked from commit 0ba96b1bc4c4df84ce3dca9875ad4a9ac8f1f759)
(cherry picked from commit 5c8e6b53f164dd16b527c603a3089735ff16df89)

Conflicts:
	docker/README.md
	https://codeberg.org/forgejo/forgejo/pulls/1351
(cherry picked from commit b3121c8004f675b31482cdbd564f9a830be48acd)
(cherry picked from commit 607f8704163bd24bfc7ff1d6a812b5e887746797)
---
 docker/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index a6d7c9a843..5f65c8c973 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,7 +1,7 @@
-# Gitea - Docker
+# Forgejo - Docker
 
-Dockerfile is found in root of repository.
+The Dockerfile can be found in the root of repository. [Dockerfile](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/Dockerfile) & [Dockerfile.rootless](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/Dockerfile.rootless).
 
-Docker image can be found on [docker hub](https://hub.docker.com/r/gitea/gitea)
+The Docker image can be found on [Coddeberg](https://codeberg.org/forgejo/-/packages/container/forgejo/).
 
-Documentation on using docker image can be found on [Gitea Docs site](https://docs.gitea.com/installation/install-with-docker-rootless)
+Documentation on how you can use the docker image can be found on the [Forgejo documentation website](https://forgejo.org/docs/latest/admin/installation/#installation-with-docker).

From 14d3ae7e3ae67dff3443db17e4373e5947ed6c6c Mon Sep 17 00:00:00 2001
From: firefly-cpp <iztok@iztok-jr-fister.eu>
Date: Mon, 28 Aug 2023 23:11:04 +0200
Subject: [PATCH 33/36] [BRANDING] healthcheck/check.go

(cherry picked from commit d703a236cebadc0186b7b2431b3b42a54b3d1f09)
(cherry picked from commit d84ce3ff2098e9ba3c7241605ea25951dcb57ca6)
(cherry picked from commit 2dbb8446069c79017dcc4a9921dffcb73594d02c)
---
 routers/web/healthcheck/check.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/web/healthcheck/check.go b/routers/web/healthcheck/check.go
index ecb73a928f..e89498a8ae 100644
--- a/routers/web/healthcheck/check.go
+++ b/routers/web/healthcheck/check.go
@@ -105,7 +105,7 @@ func checkDatabase(ctx context.Context, checks checks) status {
 		if !setting.EnableSQLite3 {
 			st.Status = fail
 			st.Time = getCheckTime()
-			log.Error("SQLite3 health check failed with error: %v", "this Gitea binary is built without SQLite3 enabled")
+			log.Error("SQLite3 health check failed with error: %v", "this Forgejo binary is built without SQLite3 enabled")
 		} else {
 			if _, err := os.Stat(setting.Database.Path); err != nil {
 				st.Status = fail

From a81e4e46f3b0e619cea959de5ffde2e811d6008e Mon Sep 17 00:00:00 2001
From: Caesar Schinas <caesar@caesarschinas.com>
Date: Tue, 29 Aug 2023 15:28:23 +0100
Subject: [PATCH 34/36] [BRANDING] s/Gitea/Forgejo/g in CLI output

(cherry picked from commit 7543c126bbb78d5d29c253a88b56ccd2dd394928)
(cherry picked from commit b66f422fc3b9018aa948a869045cb3684e80f5f2)
---
 cmd/actions.go         |  2 +-
 cmd/cert.go            |  2 +-
 cmd/docs.go            |  2 +-
 cmd/doctor.go          |  6 +++---
 cmd/hook.go            | 12 ++++++------
 cmd/keys.go            |  2 +-
 cmd/main.go            |  2 +-
 cmd/manager_logging.go |  4 ++--
 cmd/serv.go            |  6 +++---
 cmd/web.go             | 18 +++++++++---------
 10 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/cmd/actions.go b/cmd/actions.go
index 052afb9ebc..6b9ce19d65 100644
--- a/cmd/actions.go
+++ b/cmd/actions.go
@@ -17,7 +17,7 @@ var (
 	CmdActions = &cli.Command{
 		Name:        "actions",
 		Usage:       "",
-		Description: "Commands for managing Gitea Actions",
+		Description: "Commands for managing Forgejo Actions",
 		Subcommands: []*cli.Command{
 			subcmdActionsGenRunnerToken,
 		},
diff --git a/cmd/cert.go b/cmd/cert.go
index 38241d71a3..bf83af389f 100644
--- a/cmd/cert.go
+++ b/cmd/cert.go
@@ -136,7 +136,7 @@ func runCert(c *cli.Context) error {
 		SerialNumber: serialNumber,
 		Subject: pkix.Name{
 			Organization: []string{"Acme Co"},
-			CommonName:   "Gitea",
+			CommonName:   "Forgejo",
 		},
 		NotBefore: notBefore,
 		NotAfter:  notAfter,
diff --git a/cmd/docs.go b/cmd/docs.go
index 605d02e3ef..1dc0980c00 100644
--- a/cmd/docs.go
+++ b/cmd/docs.go
@@ -15,7 +15,7 @@ import (
 var CmdDocs = &cli.Command{
 	Name:        "docs",
 	Usage:       "Output CLI documentation",
-	Description: "A command to output Gitea's CLI documentation, optionally to a file.",
+	Description: "A command to output Forgejo's CLI documentation, optionally to a file.",
 	Action:      runDocs,
 	Flags: []cli.Flag{
 		&cli.BoolFlag{
diff --git a/cmd/doctor.go b/cmd/doctor.go
index d040a3af1c..3230893fda 100644
--- a/cmd/doctor.go
+++ b/cmd/doctor.go
@@ -25,7 +25,7 @@ import (
 var cmdDoctorCheck = &cli.Command{
 	Name:        "check",
 	Usage:       "Diagnose and optionally fix problems",
-	Description: "A command to diagnose problems with the current Gitea instance according to the given configuration. Some problems can optionally be fixed by modifying the database or data storage.",
+	Description: "A command to diagnose problems with the current Forgejo instance according to the given configuration. Some problems can optionally be fixed by modifying the database or data storage.",
 	Action:      runDoctorCheck,
 	Flags: []cli.Flag{
 		&cli.BoolFlag{
@@ -64,7 +64,7 @@ var cmdDoctorCheck = &cli.Command{
 var CmdDoctor = &cli.Command{
 	Name:        "doctor",
 	Usage:       "Diagnose and optionally fix problems",
-	Description: "A command to diagnose problems with the current Gitea instance according to the given configuration. Some problems can optionally be fixed by modifying the database or data storage.",
+	Description: "A command to diagnose problems with the current Forgejo instance according to the given configuration. Some problems can optionally be fixed by modifying the database or data storage.",
 
 	Subcommands: []*cli.Command{
 		cmdDoctorCheck,
@@ -83,7 +83,7 @@ var cmdRecreateTable = &cli.Command{
 			Usage: "Print SQL commands sent",
 		},
 	},
-	Description: `The database definitions Gitea uses change across versions, sometimes changing default values and leaving old unused columns.
+	Description: `The database definitions Forgejo uses change across versions, sometimes changing default values and leaving old unused columns.
 
 This command will cause Xorm to recreate tables, copying over the data and deleting the old table.
 
diff --git a/cmd/hook.go b/cmd/hook.go
index f38fd8831b..403f2c6ea4 100644
--- a/cmd/hook.go
+++ b/cmd/hook.go
@@ -172,9 +172,9 @@ func runHookPreReceive(c *cli.Context) error {
 
 	if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 {
 		if setting.OnlyAllowPushIfGiteaEnvironmentSet {
-			return fail(ctx, `Rejecting changes as Gitea environment not set.
+			return fail(ctx, `Rejecting changes as Forgejo environment not set.
 If you are pushing over SSH you must push with a key managed by
-Gitea or set your environment appropriately.`, "")
+Forgejo or set your environment appropriately.`, "")
 		}
 		return nil
 	}
@@ -316,9 +316,9 @@ func runHookPostReceive(c *cli.Context) error {
 
 	if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 {
 		if setting.OnlyAllowPushIfGiteaEnvironmentSet {
-			return fail(ctx, `Rejecting changes as Gitea environment not set.
+			return fail(ctx, `Rejecting changes as Forgejo environment not set.
 If you are pushing over SSH you must push with a key managed by
-Gitea or set your environment appropriately.`, "")
+Forgejo or set your environment appropriately.`, "")
 		}
 		return nil
 	}
@@ -485,9 +485,9 @@ func runHookProcReceive(c *cli.Context) error {
 
 	if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 {
 		if setting.OnlyAllowPushIfGiteaEnvironmentSet {
-			return fail(ctx, `Rejecting changes as Gitea environment not set.
+			return fail(ctx, `Rejecting changes as Forgejo environment not set.
 If you are pushing over SSH you must push with a key managed by
-Gitea or set your environment appropriately.`, "")
+Forgejo or set your environment appropriately.`, "")
 		}
 		return nil
 	}
diff --git a/cmd/keys.go b/cmd/keys.go
index b846782529..94ccfd9852 100644
--- a/cmd/keys.go
+++ b/cmd/keys.go
@@ -17,7 +17,7 @@ import (
 // CmdKeys represents the available keys sub-command
 var CmdKeys = &cli.Command{
 	Name:   "keys",
-	Usage:  "This command queries the Gitea database to get the authorized command for a given ssh key fingerprint",
+	Usage:  "This command queries the Forgejo database to get the authorized command for a given ssh key fingerprint",
 	Before: PrepareConsoleLoggerLevel(log.FATAL),
 	Action: runKeys,
 	Flags: []cli.Flag{
diff --git a/cmd/main.go b/cmd/main.go
index d1a632fb83..6bc0ba515e 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -78,7 +78,7 @@ func appGlobalFlags() []cli.Flag {
 		&cli.StringFlag{
 			Name:    "work-path",
 			Aliases: []string{"w"},
-			Usage:   "Set Gitea's working path (defaults to the Gitea's binary directory)",
+			Usage:   "Set Forgejo's working path (defaults to the directory of the Forgejo binary)",
 		},
 	}
 }
diff --git a/cmd/manager_logging.go b/cmd/manager_logging.go
index 7d34fc9ac2..2c701f2672 100644
--- a/cmd/manager_logging.go
+++ b/cmd/manager_logging.go
@@ -62,7 +62,7 @@ var (
 		Subcommands: []*cli.Command{
 			{
 				Name:  "pause",
-				Usage: "Pause logging (Gitea will buffer logs up to a certain point and will drop them after that point)",
+				Usage: "Pause logging (Forgejo will buffer logs up to a certain point and will drop them after that point)",
 				Flags: []cli.Flag{
 					&cli.BoolFlag{
 						Name: "debug",
@@ -80,7 +80,7 @@ var (
 				Action: runResumeLogging,
 			}, {
 				Name:  "release-and-reopen",
-				Usage: "Cause Gitea to release and re-open files used for logging",
+				Usage: "Cause Forgejo to release and re-open files used for logging",
 				Flags: []cli.Flag{
 					&cli.BoolFlag{
 						Name: "debug",
diff --git a/cmd/serv.go b/cmd/serv.go
index 55fa50cd3d..43e6eaba2b 100644
--- a/cmd/serv.go
+++ b/cmd/serv.go
@@ -103,12 +103,12 @@ func fail(ctx context.Context, userMessage, logMsgFmt string, args ...any) error
 	// There appears to be a chance to cause a zombie process and failure to read the Exit status
 	// if nothing is outputted on stdout.
 	_, _ = fmt.Fprintln(os.Stdout, "")
-	_, _ = fmt.Fprintln(os.Stderr, "Gitea:", userMessage)
+	_, _ = fmt.Fprintln(os.Stderr, "Forgejo:", userMessage)
 
 	if logMsgFmt != "" {
 		logMsg := fmt.Sprintf(logMsgFmt, args...)
 		if !setting.IsProd {
-			_, _ = fmt.Fprintln(os.Stderr, "Gitea:", logMsg)
+			_, _ = fmt.Fprintln(os.Stderr, "Forgejo:", logMsg)
 		}
 		if userMessage != "" {
 			if unicode.IsPunct(rune(userMessage[len(userMessage)-1])) {
@@ -143,7 +143,7 @@ func runServ(c *cli.Context) error {
 	setup(ctx, c.Bool("debug"))
 
 	if setting.SSH.Disabled {
-		println("Gitea: SSH has been disabled")
+		println("Forgejo: SSH has been disabled")
 		return nil
 	}
 
diff --git a/cmd/web.go b/cmd/web.go
index 01386251be..ef82486c1f 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -34,8 +34,8 @@ var PIDFile = "/run/gitea.pid"
 // CmdWeb represents the available web sub-command.
 var CmdWeb = &cli.Command{
 	Name:  "web",
-	Usage: "Start Gitea web server",
-	Description: `Gitea web server is the only thing you need to run,
+	Usage: "Start the Forgejo web server",
+	Description: `The Forgejo web server is the only thing you need to run,
 and it takes care of all the other things for you`,
 	Before: PrepareConsoleLoggerLevel(log.INFO),
 	Action: runWeb,
@@ -108,7 +108,7 @@ func createPIDFile(pidPath string) {
 }
 
 func showWebStartupMessage(msg string) {
-	log.Info("Gitea version: %s%s", setting.AppVer, setting.AppBuiltWith)
+	log.Info("Forgejo version: %s%s", setting.AppVer, setting.AppBuiltWith)
 	log.Info("* RunMode: %s", setting.RunMode)
 	log.Info("* AppPath: %s", setting.AppPath)
 	log.Info("* WorkPath: %s", setting.AppWorkPath)
@@ -136,13 +136,13 @@ func serveInstall(ctx *cli.Context) error {
 	c := install.Routes()
 	err := listen(c, false)
 	if err != nil {
-		log.Critical("Unable to open listener for installer. Is Gitea already running?")
+		log.Critical("Unable to open listener for installer. Is Forgejo already running?")
 		graceful.GetManager().DoGracefulShutdown()
 	}
 	select {
 	case <-graceful.GetManager().IsShutdown():
 		<-graceful.GetManager().Done()
-		log.Info("PID: %d Gitea Web Finished", os.Getpid())
+		log.Info("PID: %d Forgejo Web Finished", os.Getpid())
 		log.GetManager().Close()
 		return err
 	default:
@@ -211,7 +211,7 @@ func serveInstalled(ctx *cli.Context) error {
 	webRoutes := routers.NormalRoutes()
 	err := listen(webRoutes, true)
 	<-graceful.GetManager().Done()
-	log.Info("PID: %d Gitea Web Finished", os.Getpid())
+	log.Info("PID: %d Forgejo Web Finished", os.Getpid())
 	log.GetManager().Close()
 	return err
 }
@@ -237,9 +237,9 @@ func runWeb(ctx *cli.Context) error {
 	defer cancel()
 
 	if os.Getppid() > 1 && len(os.Getenv("LISTEN_FDS")) > 0 {
-		log.Info("Restarting Gitea on PID: %d from parent PID: %d", os.Getpid(), os.Getppid())
+		log.Info("Restarting Forgejo on PID: %d from parent PID: %d", os.Getpid(), os.Getppid())
 	} else {
-		log.Info("Starting Gitea on PID: %d", os.Getpid())
+		log.Info("Starting Forgejo on PID: %d", os.Getpid())
 	}
 
 	// Set pid file setting
@@ -299,7 +299,7 @@ func listen(m http.Handler, handleRedirector bool) error {
 	if setting.Protocol != setting.HTTPUnix && setting.Protocol != setting.FCGIUnix {
 		listenAddr = net.JoinHostPort(listenAddr, setting.HTTPPort)
 	}
-	_, _, finished := process.GetManager().AddTypedContext(graceful.GetManager().HammerContext(), "Web: Gitea Server", process.SystemProcessType, true)
+	_, _, finished := process.GetManager().AddTypedContext(graceful.GetManager().HammerContext(), "Web: Forgejo Server", process.SystemProcessType, true)
 	defer finished()
 	log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubURL)
 	// This can be useful for users, many users do wrong to their config and get strange behaviors behind a reverse-proxy.

From ed8101ba6cc87526554a69f58a49507a79eadb35 Mon Sep 17 00:00:00 2001
From: firefly-cpp <iztok@iztok-jr-fister.eu>
Date: Tue, 29 Aug 2023 21:22:05 +0200
Subject: [PATCH 35/36] [BRANDING] Gitea->Forgejo in mailer code

(cherry picked from commit b91afea4ff5e092452b5848900fc426b1c7289d5)
(cherry picked from commit 5d7428167c8ee5f25fb719f32a561472ef1aee68)
---
 services/mailer/mail.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/mailer/mail.go b/services/mailer/mail.go
index 50a2cc57d3..a90eb6ea38 100644
--- a/services/mailer/mail.go
+++ b/services/mailer/mail.go
@@ -61,7 +61,7 @@ func SendTestMail(email string) error {
 		// No mail service configured
 		return nil
 	}
-	return gomail.Send(Sender, NewMessage(email, "Gitea Test Email!", "Gitea Test Email!").ToMessage())
+	return gomail.Send(Sender, NewMessage(email, "Forgejo Test Email!", "Forgejo Test Email!").ToMessage())
 }
 
 // sendUserMail sends a mail to the user

From 133f2fc6cc2e977a5f7660ca4c214c92ac036421 Mon Sep 17 00:00:00 2001
From: Aravinth Manivannan <realaravinth@batsense.net>
Date: Fri, 8 Sep 2023 21:10:22 +0530
Subject: [PATCH 36/36] [BRANDING] use 'Forgejo' for Discord, Packagist, and
 Slack webhooks

Refs: https://codeberg.org/forgejo/forgejo/issues/1387

(cherry picked from commit 7dc3a05f5b9013a0696f071ebea4d2403c1c36a8)
---
 templates/repo/settings/webhook/discord.tmpl   | 2 +-
 templates/repo/settings/webhook/packagist.tmpl | 2 +-
 templates/repo/settings/webhook/slack.tmpl     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/repo/settings/webhook/discord.tmpl b/templates/repo/settings/webhook/discord.tmpl
index 3d943c8219..3bb6dac667 100644
--- a/templates/repo/settings/webhook/discord.tmpl
+++ b/templates/repo/settings/webhook/discord.tmpl
@@ -8,7 +8,7 @@
 		</div>
 		<div class="field">
 			<label for="username">{{.locale.Tr "repo.settings.discord_username"}}</label>
-			<input id="username" name="username" value="{{.DiscordHook.Username}}" placeholder="Gitea">
+			<input id="username" name="username" value="{{.DiscordHook.Username}}" placeholder="Forgejo">
 		</div>
 		<div class="field">
 			<label for="icon_url">{{.locale.Tr "repo.settings.discord_icon_url"}}</label>
diff --git a/templates/repo/settings/webhook/packagist.tmpl b/templates/repo/settings/webhook/packagist.tmpl
index b8033c1043..6e67b81f73 100644
--- a/templates/repo/settings/webhook/packagist.tmpl
+++ b/templates/repo/settings/webhook/packagist.tmpl
@@ -4,7 +4,7 @@
 		{{.CsrfTokenHtml}}
 		<div class="required field {{if .Err_Username}}error{{end}}">
 			<label for="username">{{.locale.Tr "repo.settings.packagist_username"}}</label>
-			<input id="username" name="username" value="{{.PackagistHook.Username}}" placeholder="Gitea" autofocus required>
+			<input id="username" name="username" value="{{.PackagistHook.Username}}" placeholder="Forgejo" autofocus required>
 		</div>
 		<div class="required field {{if .Err_APIToken}}error{{end}}">
 			<label for="api_token">{{.locale.Tr "repo.settings.packagist_api_token"}}</label>
diff --git a/templates/repo/settings/webhook/slack.tmpl b/templates/repo/settings/webhook/slack.tmpl
index 335966a6d1..0dc2d1d45c 100644
--- a/templates/repo/settings/webhook/slack.tmpl
+++ b/templates/repo/settings/webhook/slack.tmpl
@@ -13,7 +13,7 @@
 
 		<div class="field">
 			<label for="username">{{.locale.Tr "repo.settings.slack_username"}}</label>
-			<input id="username" name="username" value="{{.SlackHook.Username}}" placeholder="Gitea">
+			<input id="username" name="username" value="{{.SlackHook.Username}}" placeholder="Forgejo">
 		</div>
 		<div class="field">
 			<label for="icon_url">{{.locale.Tr "repo.settings.slack_icon_url"}}</label>