Skip to content

Commit fb5031b

Browse files
authored
Merge branch 'go-gitea:main' into fix-org-projects-page-incorrect-tab
2 parents 9e3ed4c + b811ab4 commit fb5031b

File tree

595 files changed

+7711
-4776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

595 files changed

+7711
-4776
lines changed

.drone.yml

Lines changed: 136 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,10 @@ depends_on:
985985

986986
trigger:
987987
ref:
988-
- "refs/tags/**"
988+
include:
989+
- "refs/tags/**"
990+
exclude:
991+
- "refs/tags/**-rc*"
989992
event:
990993
exclude:
991994
- cron
@@ -1033,6 +1036,68 @@ steps:
10331036
event:
10341037
exclude:
10351038
- pull_request
1039+
---
1040+
1041+
kind: pipeline
1042+
type: docker
1043+
name: docker-linux-amd64-release-candidate-version
1044+
1045+
platform:
1046+
os: linux
1047+
arch: amd64
1048+
1049+
depends_on:
1050+
- testing-amd64
1051+
- testing-arm64
1052+
1053+
trigger:
1054+
ref:
1055+
- "refs/tags/**-rc*"
1056+
event:
1057+
exclude:
1058+
- cron
1059+
1060+
steps:
1061+
- name: fetch-tags
1062+
image: docker:git
1063+
pull: always
1064+
commands:
1065+
- git config --global --add safe.directory /drone/src
1066+
- git fetch --tags --force
1067+
1068+
- name: publish
1069+
image: techknowlogick/drone-docker:latest
1070+
pull: always
1071+
settings:
1072+
tags: ${DRONE_TAG##v}-linux-amd64
1073+
repo: gitea/gitea
1074+
build_args:
1075+
- GOPROXY=https://goproxy.io
1076+
password:
1077+
from_secret: docker_password
1078+
username:
1079+
from_secret: docker_username
1080+
when:
1081+
event:
1082+
exclude:
1083+
- pull_request
1084+
1085+
- name: publish-rootless
1086+
image: techknowlogick/drone-docker:latest
1087+
settings:
1088+
dockerfile: Dockerfile.rootless
1089+
tags: ${DRONE_TAG##v}-linux-amd64-rootless
1090+
repo: gitea/gitea
1091+
build_args:
1092+
- GOPROXY=https://goproxy.io
1093+
password:
1094+
from_secret: docker_password
1095+
username:
1096+
from_secret: docker_username
1097+
when:
1098+
event:
1099+
exclude:
1100+
- pull_request
10361101

10371102
---
10381103
kind: pipeline
@@ -1209,7 +1274,10 @@ depends_on:
12091274

12101275
trigger:
12111276
ref:
1212-
- "refs/tags/**"
1277+
include:
1278+
- "refs/tags/**"
1279+
exclude:
1280+
- "refs/tags/**-rc*"
12131281
event:
12141282
exclude:
12151283
- cron
@@ -1258,6 +1326,68 @@ steps:
12581326
exclude:
12591327
- pull_request
12601328

1329+
---
1330+
kind: pipeline
1331+
type: docker
1332+
name: docker-linux-arm64-release-candidate-version
1333+
1334+
platform:
1335+
os: linux
1336+
arch: arm64
1337+
1338+
depends_on:
1339+
- testing-amd64
1340+
- testing-arm64
1341+
1342+
trigger:
1343+
ref:
1344+
- "refs/tags/**-rc*"
1345+
event:
1346+
exclude:
1347+
- cron
1348+
1349+
steps:
1350+
- name: fetch-tags
1351+
image: docker:git
1352+
pull: always
1353+
commands:
1354+
- git config --global --add safe.directory /drone/src
1355+
- git fetch --tags --force
1356+
1357+
- name: publish
1358+
image: techknowlogick/drone-docker:latest
1359+
pull: always
1360+
settings:
1361+
tags: ${DRONE_TAG##v}-linux-arm64
1362+
repo: gitea/gitea
1363+
build_args:
1364+
- GOPROXY=https://goproxy.io
1365+
password:
1366+
from_secret: docker_password
1367+
username:
1368+
from_secret: docker_username
1369+
when:
1370+
event:
1371+
exclude:
1372+
- pull_request
1373+
1374+
- name: publish-rootless
1375+
image: techknowlogick/drone-docker:latest
1376+
settings:
1377+
dockerfile: Dockerfile.rootless
1378+
tags: ${DRONE_TAG##v}-linux-arm64-rootless
1379+
repo: gitea/gitea
1380+
build_args:
1381+
- GOPROXY=https://goproxy.io
1382+
password:
1383+
from_secret: docker_password
1384+
username:
1385+
from_secret: docker_username
1386+
when:
1387+
event:
1388+
exclude:
1389+
- pull_request
1390+
12611391
---
12621392
kind: pipeline
12631393
type: docker
@@ -1427,7 +1557,9 @@ trigger:
14271557

14281558
depends_on:
14291559
- docker-linux-amd64-release-version
1560+
- docker-linux-amd64-release-candidate-version
14301561
- docker-linux-arm64-release-version
1562+
- docker-linux-arm64-release-candidate-version
14311563

14321564
---
14331565
kind: pipeline
@@ -1509,6 +1641,8 @@ depends_on:
15091641
- docker-linux-arm64-release
15101642
- docker-linux-amd64-release-version
15111643
- docker-linux-arm64-release-version
1644+
- docker-linux-amd64-release-candidate-version
1645+
- docker-linux-arm64-release-candidate-version
15121646
- docker-linux-amd64-release-branch
15131647
- docker-linux-arm64-release-branch
15141648
- docker-manifest

.eslintrc.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ rules:
149149
jquery/no-global-eval: [2]
150150
jquery/no-grep: [2]
151151
jquery/no-has: [2]
152-
jquery/no-hide: [0]
152+
jquery/no-hide: [2]
153153
jquery/no-html: [0]
154154
jquery/no-in-array: [2]
155155
jquery/no-is-array: [2]
@@ -166,13 +166,13 @@ rules:
166166
jquery/no-proxy: [2]
167167
jquery/no-ready: [0]
168168
jquery/no-serialize: [2]
169-
jquery/no-show: [0]
169+
jquery/no-show: [2]
170170
jquery/no-size: [2]
171171
jquery/no-sizzle: [0]
172172
jquery/no-slide: [0]
173173
jquery/no-submit: [0]
174174
jquery/no-text: [0]
175-
jquery/no-toggle: [0]
175+
jquery/no-toggle: [2]
176176
jquery/no-trigger: [0]
177177
jquery/no-trim: [2]
178178
jquery/no-val: [0]

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ linters:
2828
fast: false
2929

3030
run:
31-
go: 1.20
31+
go: "1.20"
3232
timeout: 10m
3333
skip-dirs:
3434
- node_modules

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Kim Carlbäcker <[email protected]> (@bkcsoft)
66
LefsFlare <[email protected]> (@LefsFlarey)
77
Lunny Xiao <[email protected]> (@lunny)
88
Matthias Loibl <[email protected]> (@metalmatze)
9-
Morgan Bazalgette <[email protected]> (@thehowl)
109
Rachid Zarouali <[email protected]> (@xinity)
1110
Rémy Boulanouar <[email protected]> (@DblK)
1211
Sandro Santilli <[email protected]> (@strk)

0 commit comments

Comments
 (0)