Skip to content

Commit 21561af

Browse files
authored
Merge branch 'main' into actions-enh
2 parents 564fad2 + 3c6aa8d commit 21561af

Some content is hidden

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

48 files changed

+197
-323
lines changed

.github/workflows/cron-licenses.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ jobs:
1010
if: github.repository == 'go-gitea/gitea'
1111
steps:
1212
- uses: actions/checkout@v3
13-
- uses: actions/setup-go@v3
13+
- uses: actions/setup-go@v4
1414
with:
15-
go-version: ">=1.20.1"
15+
go-version: ">=1.20"
16+
check-latest: true
1617
- run: make generate-license generate-gitignore
1718
timeout-minutes: 40
1819
- name: push translations to repo

.github/workflows/pull-db-tests.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ jobs:
4141
- uses: actions/checkout@v3
4242
- uses: actions/setup-go@v4
4343
with:
44-
go-version: ">=1.20.0"
44+
go-version: ">=1.20"
45+
check-latest: true
4546
- name: Add hosts to /etc/hosts
4647
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 pgsql ldap minio" | sudo tee -a /etc/hosts'
4748
- run: make deps-backend
@@ -65,7 +66,8 @@ jobs:
6566
- uses: actions/checkout@v3
6667
- uses: actions/setup-go@v4
6768
with:
68-
go-version: ">=1.20.0"
69+
go-version: ">=1.20"
70+
check-latest: true
6971
- run: make deps-backend
7072
- run: make backend
7173
env:
@@ -123,7 +125,8 @@ jobs:
123125
- uses: actions/checkout@v3
124126
- uses: actions/setup-go@v4
125127
with:
126-
go-version: ">=1.20.0"
128+
go-version: ">=1.20"
129+
check-latest: true
127130
- name: Add hosts to /etc/hosts
128131
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mysql elasticsearch smtpimap" | sudo tee -a /etc/hosts'
129132
- run: make deps-backend
@@ -172,7 +175,8 @@ jobs:
172175
- uses: actions/checkout@v3
173176
- uses: actions/setup-go@v4
174177
with:
175-
go-version: ">=1.20.0"
178+
go-version: ">=1.20"
179+
check-latest: true
176180
- name: Add hosts to /etc/hosts
177181
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mysql elasticsearch smtpimap" | sudo tee -a /etc/hosts'
178182
- run: make deps-backend
@@ -203,7 +207,8 @@ jobs:
203207
- uses: actions/checkout@v3
204208
- uses: actions/setup-go@v4
205209
with:
206-
go-version: ">=1.20.0"
210+
go-version: ">=1.20"
211+
check-latest: true
207212
- name: Add hosts to /etc/hosts
208213
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mysql8" | sudo tee -a /etc/hosts'
209214
- run: make deps-backend
@@ -233,7 +238,8 @@ jobs:
233238
- uses: actions/checkout@v3
234239
- uses: actions/setup-go@v4
235240
with:
236-
go-version: ">=1.20.0"
241+
go-version: ">=1.20"
242+
check-latest: true
237243
- name: Add hosts to /etc/hosts
238244
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mssql" | sudo tee -a /etc/hosts'
239245
- run: make deps-backend

modules/context/context_response.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ func (ctx *Context) RedirectToFirst(location ...string) {
4949
continue
5050
}
5151

52-
// Unfortunately browsers consider a redirect Location with preceding "//" and "/\" as meaning redirect to "http(s)://REST_OF_PATH"
52+
// Unfortunately browsers consider a redirect Location with preceding "//", "\\" and "/\" as meaning redirect to "http(s)://REST_OF_PATH"
5353
// Therefore we should ignore these redirect locations to prevent open redirects
54-
if len(loc) > 1 && loc[0] == '/' && (loc[1] == '/' || loc[1] == '\\') {
54+
if len(loc) > 1 && (loc[0] == '/' || loc[0] == '\\') && (loc[1] == '/' || loc[1] == '\\') {
5555
continue
5656
}
5757

options/locale/locale_en-US.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ explore = Explore
44
help = Help
55
logo = Logo
66
sign_in = Sign In
7-
sign_in_with = Sign In With
7+
sign_in_with_provider = Sign in with %s
8+
sign_in_or = or
89
sign_out = Sign Out
910
sign_up = Register
1011
link_account = Link Account

options/locale/locale_ru-RU.ini

Lines changed: 100 additions & 43 deletions
Large diffs are not rendered by default.

public/img/auth/azuread.png

-3.03 KB
Binary file not shown.

public/img/auth/azuread.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/auth/azureadv2.png

-3.03 KB
Binary file not shown.

public/img/auth/azureadv2.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/auth/bitbucket.png

-2.11 KB
Binary file not shown.

public/img/auth/bitbucket.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/auth/discord.png

-1.52 KB
Binary file not shown.

public/img/auth/discord.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/auth/dropbox.png

-1.39 KB
Binary file not shown.

public/img/auth/dropbox.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/auth/facebook.png

-2.04 KB
Binary file not shown.

public/img/auth/facebook.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/auth/gitea.png

-5.45 KB
Binary file not shown.

public/img/auth/gitea.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/auth/github.png

-1.12 KB
Binary file not shown.

public/img/auth/github.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/auth/gitlab.png

-3.53 KB
Binary file not shown.

public/img/auth/gitlab.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/auth/google.png

-1.58 KB
Binary file not shown.

public/img/auth/google.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/auth/mastodon.png

-4.99 KB
Binary file not shown.

public/img/auth/mastodon.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/auth/microsoftonline.png

-792 Bytes
Binary file not shown.

public/img/auth/microsoftonline.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/auth/nextcloud.png

-2.85 KB
Binary file not shown.

public/img/auth/nextcloud.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)