Skip to content

Commit 9dd786d

Browse files
65436543
authored
Merge branch 'main' into notification-sequence
2 parents ea75f6f + b08e14b commit 9dd786d

File tree

20 files changed

+100
-47
lines changed

20 files changed

+100
-47
lines changed

‎.drone.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ steps:
404404

405405
- name: update
406406
pull: default
407-
image: alpine:3.14
407+
image: alpine:3.13
408408
commands:
409409
- ./build/update-locales.sh
410410

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,18 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
216216
* Remove utf8 option from installation page (#16126)
217217
* Use Wants= over Requires= in systemd file (#15897)
218218

219+
## [1.14.5](https://github.com/go-gitea/gitea/releases/tag/v1.14.5) - 2021-07-16
220+
221+
* SECURITY
222+
* Hide mirror passwords on repo settings page (#16022) (#16355)
223+
* Update bluemonday to v1.0.15 (#16379) (#16380)
224+
* BUGFIXES
225+
* Retry rename on lock induced failures (#16435) (#16439)
226+
* Validate issue index before querying DB (#16406) (#16410)
227+
* Fix crash following ldap authentication update (#16447) (#16449)
228+
* ENHANCEMENTS
229+
* Redirect on bad CSRF instead of presenting bad page (#14937) (#16378)
230+
219231
## [1.14.4](https://github.com/go-gitea/gitea/releases/tag/v1.14.4) - 2021-07-06
220232

221233
* BUGFIXES

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
###################################
33
#Build stage
4-
FROM golang:1.16-alpine3.14 AS build-env
4+
FROM golang:1.16-alpine3.13 AS build-env
55

66
ARG GOPROXY
77
ENV GOPROXY ${GOPROXY:-direct}
@@ -25,7 +25,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
2525
# Begin env-to-ini build
2626
RUN go build contrib/environment-to-ini/environment-to-ini.go
2727

28-
FROM alpine:3.14
28+
FROM alpine:3.13
2929
LABEL maintainer="[email protected]"
3030

3131
EXPOSE 22 3000

‎Dockerfile.rootless‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
###################################
33
#Build stage
4-
FROM golang:1.16-alpine3.14 AS build-env
4+
FROM golang:1.16-alpine3.13 AS build-env
55

66
ARG GOPROXY
77
ENV GOPROXY ${GOPROXY:-direct}
@@ -25,7 +25,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
2525
# Begin env-to-ini build
2626
RUN go build contrib/environment-to-ini/environment-to-ini.go
2727

28-
FROM alpine:3.14
28+
FROM alpine:3.13
2929
LABEL maintainer="[email protected]"
3030

3131
EXPOSE 2222 3000

‎custom/conf/app.example.ini‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,9 @@ PATH =
652652
;; Default value for AllowCreateOrganization
653653
;; Every new user will have rights set to create organizations depending on this setting
654654
;DEFAULT_ALLOW_CREATE_ORGANIZATION = true
655+
;; Default value for IsRestricted
656+
;; Every new user will have restricted permissions depending on this setting
657+
;DEFAULT_USER_IS_RESTRICTED = false
655658
;;
656659
;; Either "public", "limited" or "private", default is "public"
657660
;; Limited is for users visible only to signed users

‎docs/config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ params:
1818
description: Git with a cup of tea
1919
author: The Gitea Authors
2020
website: https://docs.gitea.io
21-
version: 1.14.4
21+
version: 1.14.5
2222
minGoVersion: 1.14
2323
goVersion: 1.16
2424
minNodeVersion: 12.17

‎docs/content/doc/advanced/adding-legal-pages.en-us.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ You absolutely must not place a general ToS or privacy statement that implies th
3232
Create or append to `/path/to/custom/templates/custom/extra_links_footer.tmpl`:
3333

3434
```go
35-
<a class="item" href="{{AppSubUrl}}/privacy.html">Privacy Policy</a>
35+
<a class="item" href="{{AppSubUrl}}/assets/privacy.html">Privacy Policy</a>
3636
```
3737

3838
Restart Gitea to see the changes.

‎docs/content/doc/advanced/config-cheat-sheet.en-us.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ relation to port exhaustion.
502502
- `HCAPTCHA_SITEKEY`: **""**: Sign up at https://www.hcaptcha.com/ to get a sitekey for hcaptcha.
503503
- `DEFAULT_KEEP_EMAIL_PRIVATE`: **false**: By default set users to keep their email address private.
504504
- `DEFAULT_ALLOW_CREATE_ORGANIZATION`: **true**: Allow new users to create organizations by default.
505+
- `DEFAULT_USER_IS_RESTRICTED`: **false**: Give new users restricted permissions by default
505506
- `DEFAULT_ENABLE_DEPENDENCIES`: **true**: Enable this to have dependencies enabled by default.
506507
- `ALLOW_CROSS_REPOSITORY_DEPENDENCIES` : **true** Enable this to allow dependencies on issues from any repository where the user is granted access.
507508
- `ENABLE_USER_HEATMAP`: **true**: Enable this to display the heatmap on users profiles.

‎docs/content/doc/advanced/customizing-gitea.en-us.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ For instance, let's say you are in Germany and must add the famously legally-req
102102
just place it under your "$GITEA_CUSTOM/public/" directory (for instance `$GITEA_CUSTOM/public/impressum.html`) and put a link to it in either `$GITEA_CUSTOM/templates/custom/extra_links.tmpl` or `$GITEA_CUSTOM/templates/custom/extra_links_footer.tmpl`.
103103

104104
To match the current style, the link should have the class name "item", and you can use `{{AppSubUrl}}` to get the base URL:
105-
`<a class="item" href="{{AppSubUrl}}/impressum.html">Impressum</a>`
105+
`<a class="item" href="{{AppSubUrl}}/assets/impressum.html">Impressum</a>`
106106

107107
For more information, see [Adding Legal Pages](https://docs.gitea.io/en-us/adding-legal-pages).
108108

@@ -174,21 +174,21 @@ You can display STL file directly in Gitea by adding:
174174
175175
if ($('.view-raw>a[href$=".stl" i]').length) {
176176
$("body").append(
177-
'<link href="/Madeleine.js/src/css/Madeleine.css" rel="stylesheet">'
177+
'<link href="/assets/Madeleine.js/src/css/Madeleine.css" rel="stylesheet">'
178178
);
179179
Promise.all([
180-
lS("/Madeleine.js/src/lib/stats.js"),
181-
lS("/Madeleine.js/src/lib/detector.js"),
182-
lS("/Madeleine.js/src/lib/three.min.js"),
183-
lS("/Madeleine.js/src/Madeleine.js"),
180+
lS("/assets/Madeleine.js/src/lib/stats.js"),
181+
lS("/assets/Madeleine.js/src/lib/detector.js"),
182+
lS("/assets/Madeleine.js/src/lib/three.min.js"),
183+
lS("/assets/Madeleine.js/src/Madeleine.js"),
184184
]).then(function () {
185185
$(".view-raw")
186186
.attr("id", "view-raw")
187187
.attr("style", "padding: 0;margin-bottom: -10px;");
188188
new Madeleine({
189189
target: "view-raw",
190190
data: $('.view-raw>a[href$=".stl" i]').attr("href"),
191-
path: "/Madeleine.js/src",
191+
path: "/assets/Madeleine.js/src",
192192
});
193193
$('.view-raw>a[href$=".stl"]').remove();
194194
});

‎docs/content/doc/advanced/customizing-gitea.zh-cn.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Gitea 引用 `custom` 目录中的自定义配置文件来覆盖配置、模板
6161
"custom/public/"目录下（比如 `custom/public/impressum.html`）并且将它与 `custom/templates/custom/extra_links.tmpl` 链接起来即可。
6262

6363
这个链接应当使用一个名为“item”的 class 来匹配当前样式，您可以使用 `{{AppSubUrl}}` 来获取 base URL:
64-
`<a class="item" href="{{AppSubUrl}}/impressum.html">Impressum</a>`
64+
`<a class="item" href="{{AppSubUrl}}/assets/impressum.html">Impressum</a>`
6565

6666
同理，您可以将页签添加到 `extra_tabs.tmpl` 中，使用同样的方式来添加页签。它的具体样式需要与
6767
`templates/repo/header.tmpl` 中已有的其他选项卡的样式匹配

0 commit comments

Comments
 (0)