Skip to content

Commit 8d39b59

Browse files
committed
Merge branch 'main' of https://github.com/go-gitea/gitea into feature-swift
2 parents 5cafa15 + 7eaf192 commit 8d39b59

File tree

565 files changed

+8291
-4217
lines changed

Some content is hidden

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

565 files changed

+8291
-4217
lines changed

.drone.yml

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -763,10 +763,16 @@ steps:
763763
image: woodpeckerci/plugin-s3:latest
764764
pull: always
765765
settings:
766-
acl: public-read
767-
bucket: gitea-artifacts
768-
endpoint: https://ams3.digitaloceanspaces.com
769-
path_style: true
766+
acl:
767+
from_secret: aws_s3_acl
768+
region:
769+
from_secret: aws_s3_region
770+
bucket:
771+
from_secret: aws_s3_bucket
772+
endpoint:
773+
from_secret: aws_s3_endpoint
774+
path_style:
775+
from_secret: aws_s3_path_style
770776
source: "dist/release/*"
771777
strip_prefix: dist/release/
772778
target: "/gitea/${DRONE_BRANCH##release/v}"
@@ -784,10 +790,16 @@ steps:
784790
- name: release-main
785791
image: woodpeckerci/plugin-s3:latest
786792
settings:
787-
acl: public-read
788-
bucket: gitea-artifacts
789-
endpoint: https://ams3.digitaloceanspaces.com
790-
path_style: true
793+
acl:
794+
from_secret: aws_s3_acl
795+
region:
796+
from_secret: aws_s3_region
797+
bucket:
798+
from_secret: aws_s3_bucket
799+
endpoint:
800+
from_secret: aws_s3_endpoint
801+
path_style:
802+
from_secret: aws_s3_path_style
791803
source: "dist/release/*"
792804
strip_prefix: dist/release/
793805
target: /gitea/main
@@ -886,10 +898,16 @@ steps:
886898
image: woodpeckerci/plugin-s3:latest
887899
pull: always
888900
settings:
889-
acl: public-read
890-
bucket: gitea-artifacts
891-
endpoint: https://ams3.digitaloceanspaces.com
892-
path_style: true
901+
acl:
902+
from_secret: aws_s3_acl
903+
region:
904+
from_secret: aws_s3_region
905+
bucket:
906+
from_secret: aws_s3_bucket
907+
endpoint:
908+
from_secret: aws_s3_endpoint
909+
path_style:
910+
from_secret: aws_s3_path_style
893911
source: "dist/release/*"
894912
strip_prefix: dist/release/
895913
target: "/gitea/${DRONE_TAG##v}"

.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)

assets/go-licenses.json

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)