Merge branch 'main' of https://github.com/go-gitea/gitea

* 'main' of https://github.com/go-gitea/gitea: [doc] https-setup: explain relative paths for {CERT,KEY}_FILE fields. (go-gitea#18244) chore: remove unnecessary section (go-gitea#18209) Fix purple color in suggested label colors (go-gitea#18241) Prevent NPE when viewing non-rendered files (go-gitea#18234)
zjjhot · Jan 12, 2022 · 67ca2a5 · 67ca2a5
2 parents 458bc3d + ba9e4e2
commit 67ca2a5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 23 deletions.
diff --git a/docs/content/doc/developers/hacking-on-gitea.en-us.md b/docs/content/doc/developers/hacking-on-gitea.en-us.md
@@ -169,12 +169,6 @@ You should run the same version of go that is on the continuous integration
 server as mentioned above. `make fmt-check` will only check if your `go` would
 format differently - this may be different from the CI server version.
 
-You should run revive, vet and spell-check on the code with:
-
-```bash
-make revive vet misspell-check
-```
-
 ### Working on JS and CSS
 
 Frontend development should follow [Guidelines for Frontend Development](./guidelines-frontend.md)

diff --git a/docs/content/doc/usage/https-support.md b/docs/content/doc/usage/https-support.md
@@ -40,6 +40,8 @@ KEY_FILE  = key.pem
 Note that if your certificate is signed by a third party certificate authority (i.e. not self-signed), then cert.pem should contain the certificate chain. The server certificate must be the first entry in cert.pem, followed by the intermediaries in order (if any). The root certificate does not have to be included because the connecting client must already have it in order to estalbish the trust relationship.
 To learn more about the config values, please checkout the [Config Cheat Sheet](../config-cheat-sheet#server-server).
 
+For the `CERT_FILE` or `KEY_FILE` field, the file path is relative to the `GITEA_CUSTOM` environment variable when it is a relative path. It can be an absolute path as well.
+
 ### Setting up HTTP redirection
 
 The Gitea server is only able to listen to one port; to redirect HTTP requests to the HTTPS port, you will need to enable the HTTP redirection service:

diff --git a/templates/repo/issue/label_precolors.tmpl b/templates/repo/issue/label_precolors.tmpl
@@ -5,7 +5,7 @@
 <a class="color" style="background-color:#006b75" data-color-hex="#006b75"></a>
 <a class="color" style="background-color:#207de5" data-color-hex="#207de5"></a>
 <a class="color" style="background-color:#0052cc" data-color-hex="#0052cc"></a>
-<a class="color" style="background-color:#53e917" data-color-hex="#53e917"></a>
+<a class="color" style="background-color:#5319e7" data-color-hex="#5319e7"></a>
 <a class="color" style="background-color:#f6c6c7" data-color-hex="#f6c6c7"></a>
 <a class="color" style="background-color:#fad8c7" data-color-hex="#fad8c7"></a>
 <a class="color" style="background-color:#fef2c0" data-color-hex="#fef2c0"></a>

diff --git a/templates/repo/unicode_escape_prompt.tmpl b/templates/repo/unicode_escape_prompt.tmpl
@@ -1,17 +1,19 @@
-{{if .EscapeStatus.BadBIDI}}
-<div class="ui error message unicode-escape-prompt">
-	<span class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</span>
-	<div class="header">
-		{{$.root.i18n.Tr "repo.bidi_bad_header"}}
-	</div>
-	<p>{{$.root.i18n.Tr "repo.bidi_bad_description" | Str2html}}</p>
-</div>
-{{else if .EscapeStatus.Escaped}}
-<div class="ui warning message unicode-escape-prompt">
-	<span class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</span>
-	<div class="header">
-		{{$.root.i18n.Tr "repo.unicode_header"}}
-	</div>
-	<p>{{$.root.i18n.Tr "repo.unicode_description" | Str2html}}</p>
-</div>
+{{if .EscapeStatus}}
+	{{if .EscapeStatus.BadBIDI}}
+		<div class="ui error message unicode-escape-prompt">
+			<span class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</span>
+			<div class="header">
+				{{$.root.i18n.Tr "repo.bidi_bad_header"}}
+			</div>
+			<p>{{$.root.i18n.Tr "repo.bidi_bad_description" | Str2html}}</p>
+		</div>
+	{{else if .EscapeStatus.Escaped}}
+		<div class="ui warning message unicode-escape-prompt">
+			<span class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</span>
+			<div class="header">
+				{{$.root.i18n.Tr "repo.unicode_header"}}
+			</div>
+			<p>{{$.root.i18n.Tr "repo.unicode_description" | Str2html}}</p>
+		</div>
+	{{end}}
 {{end}}