Skip to content

Commit 801c4ce

Browse files
zeripathzeripath
authored
Merge branch 'main' into reattempt-a11y-fixes
2 parents 41dae97 + fd39e6d commit 801c4ce

33 files changed

+53
-106
lines changed

‎.drone.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ trigger:
1515
steps:
1616
- name: deps-frontend
1717
pull: always
18-
image: node:14
18+
image: node:16
1919
commands:
2020
- make node_modules
2121

2222
- name: lint-frontend
23-
image: node:14
23+
image: node:16
2424
commands:
2525
- make lint-frontend
2626
depends_on: [deps-frontend]
@@ -58,7 +58,7 @@ steps:
5858
TAGS: bindata gogit sqlite sqlite_unlock_notify
5959

6060
- name: checks-frontend
61-
image: node:14
61+
image: node:16
6262
commands:
6363
- make checks-frontend
6464
depends_on: [deps-frontend]
@@ -71,13 +71,13 @@ steps:
7171
depends_on: [lint-backend]
7272

7373
- name: test-frontend
74-
image: node:14
74+
image: node:16
7575
commands:
7676
- make test-frontend
7777
depends_on: [lint-frontend]
7878

7979
- name: build-frontend
80-
image: node:14
80+
image: node:16
8181
commands:
8282
- make frontend
8383
depends_on: [test-frontend]
@@ -514,7 +514,7 @@ steps:
514514
pull: always
515515
image: techknowlogick/xgo:go-1.16.x
516516
commands:
517-
- curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt-get install -y nodejs
517+
- curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
518518
- export PATH=$PATH:$GOPATH/bin
519519
- make release
520520
environment:
@@ -610,7 +610,7 @@ steps:
610610
pull: always
611611
image: techknowlogick/xgo:go-1.16.x
612612
commands:
613-
- curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt-get install -y nodejs
613+
- curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
614614
- export PATH=$PATH:$GOPATH/bin
615615
- make release
616616
environment:

‎modules/context/access_log.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package context
66

77
import (
88
"bytes"
9+
"context"
910
"html/template"
1011
"net/http"
1112
"time"
@@ -22,18 +23,19 @@ type routerLoggerOptions struct {
2223
Ctx map[string]interface{}
2324
}
2425

26+
var signedUserNameStringPointerKey interface{} = "signedUserNameStringPointerKey"
27+
2528
// AccessLogger returns a middleware to log access logger
2629
func AccessLogger() func(http.Handler) http.Handler {
2730
logger := log.GetLogger("access")
2831
logTemplate, _ := template.New("log").Parse(setting.AccessLogTemplate)
2932
return func(next http.Handler) http.Handler {
3033
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
3134
start := time.Now()
32-
next.ServeHTTP(w, req)
3335
identity := "-"
34-
if val := SignedUserName(req); val != "" {
35-
identity = val
36-
}
36+
r := req.WithContext(context.WithValue(req.Context(), signedUserNameStringPointerKey, &identity))
37+
38+
next.ServeHTTP(w, r)
3739
rw := w.(ResponseWriter)
3840

3941
buf := bytes.NewBuffer([]byte{})

‎modules/context/api.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,17 @@ func APIContexter() func(http.Handler) http.Handler {
275275
ctx.Data["CsrfToken"] = html.EscapeString(ctx.csrf.GetToken())
276276

277277
next.ServeHTTP(ctx.Resp, ctx.Req)
278+
279+
// Handle adding signedUserName to the context for the AccessLogger
280+
usernameInterface := ctx.Data["SignedUserName"]
281+
identityPtrInterface := ctx.Req.Context().Value(signedUserNameStringPointerKey)
282+
if usernameInterface != nil && identityPtrInterface != nil {
283+
username := usernameInterface.(string)
284+
identityPtr := identityPtrInterface.(*string)
285+
if identityPtr != nil && username != "" {
286+
*identityPtr = username
287+
}
288+
}
278289
})
279290
}
280291
}

‎modules/context/context.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -770,6 +770,17 @@ func Contexter() func(next http.Handler) http.Handler {
770770
}
771771

772772
next.ServeHTTP(ctx.Resp, ctx.Req)
773+
774+
// Handle adding signedUserName to the context for the AccessLogger
775+
usernameInterface := ctx.Data["SignedUserName"]
776+
identityPtrInterface := ctx.Req.Context().Value(signedUserNameStringPointerKey)
777+
if usernameInterface != nil && identityPtrInterface != nil {
778+
username := usernameInterface.(string)
779+
identityPtr := identityPtrInterface.(*string)
780+
if identityPtr != nil && username != "" {
781+
*identityPtr = username
782+
}
783+
}
773784
})
774785
}
775786
}

‎modules/csv/csv.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package csv
66

77
import (
88
"bytes"
9-
"encoding/csv"
109
stdcsv "encoding/csv"
1110
"errors"
1211
"io"
@@ -97,9 +96,9 @@ func scoreDelimiter(lines []string, delim rune) float64 {
9796

9897
// FormatError converts csv errors into readable messages.
9998
func FormatError(err error, locale translation.Locale) (string, error) {
100-
var perr *csv.ParseError
99+
var perr *stdcsv.ParseError
101100
if errors.As(err, &perr) {
102-
if perr.Err == csv.ErrFieldCount {
101+
if perr.Err == stdcsv.ErrFieldCount {
103102
return locale.Tr("repo.error.csv.invalid_field_count", perr.Line), nil
104103
}
105104
return locale.Tr("repo.error.csv.unexpected", perr.Line, perr.Column), nil

‎options/locale/locale_bg-BG.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,6 @@ pulls.num_conflicting_files_n=%d конфликтни файлове
787787
pulls.no_merge_desc=Тази заявка за сливане не може да бъде обединена, защото всички опции за обединяване на хранилището са изключени.
788788
pulls.no_merge_helper=Включете опции за сливане в настройките на хранилището или обединете заявката за сливане ръчно.
789789
pulls.no_merge_wip=Тази заявка за сливане не може да бъде обединена, защото е отбелязана като работа в прогрес.
790-
pulls.merge_pull_request=Обедини заявка за сливане
791790
; </summary><code>%[2]s<br>%[3]s</code></details>
792791
pulls.status_checks_success=Всички проверявания бяха успешни
793792
pulls.update_branch=Осъвременяване на клона

‎options/locale/locale_cs-CZ.ini‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,10 +1358,6 @@ pulls.no_merge_helper=Povolte možnosti sloučení v nastavení repozitáře neb
13581358
pulls.no_merge_wip=Požadavek na natažení nemůže být sloučen protože je označen jako nedokončený.
13591359
pulls.no_merge_not_ready=Tento požadavek na natažení není připraven na sloučení, zkontrolujte stav posouzení a kontrolu stavu.
13601360
pulls.no_merge_access=Nemáte oprávnění sloučit tento požadavek na natažení.
1361-
pulls.merge_pull_request=Sloučit požadavek na natažení
1362-
pulls.rebase_merge_pull_request=Rebase a sloučit
1363-
pulls.rebase_merge_commit_pull_request=Rebase a sloučit (--no-ff)
1364-
pulls.squash_merge_pull_request=Squash a sloučit
13651361
pulls.merge_manually=Sloučeno ručně
13661362
pulls.merge_commit_id=ID slučovací revize
13671363
pulls.require_signed_wont_sign=Větev vyžaduje podepsané revize, ale toto sloučení nebude podepsáno

‎options/locale/locale_de-DE.ini‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,10 +1436,6 @@ pulls.no_merge_helper=Aktiviere Mergeoptionen in den Repositoryeinstellungen ode
14361436
pulls.no_merge_wip=Dieser Pull Request kann nicht gemergt werden, da er als Work In Progress gekennzeichnet ist.
14371437
pulls.no_merge_not_ready=Dieser Pull-Request kann nicht gemergt werden, überprüfe den Reviewstatus und die Statusprüfungen.
14381438
pulls.no_merge_access=Du bist nicht berechtigt, diesen Pull-Request zu Mergen.
1439-
pulls.merge_pull_request=Pull-Request mergen
1440-
pulls.rebase_merge_pull_request=Rebase und Mergen
1441-
pulls.rebase_merge_commit_pull_request=Rebasen und Mergen (--no-ff)
1442-
pulls.squash_merge_pull_request=Zusammenfassen und Mergen
14431439
pulls.merge_manually=Manuell mergen
14441440
pulls.merge_commit_id=Der Mergecommit ID
14451441
pulls.require_signed_wont_sign=Der Branch erfordert einen signierten Commit, aber dieser Merge wird nicht signiert

‎options/locale/locale_es-ES.ini‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,10 +1436,6 @@ pulls.no_merge_helper=Habilite las opciones de combinación en la configuración
14361436
pulls.no_merge_wip=Este pull request no se puede combinar porque está marcada como un trabajo en progreso.
14371437
pulls.no_merge_not_ready=Este pull request no está listo para ser fusionado, compruebe el estado de revisión y las comprobaciones de estado.
14381438
pulls.no_merge_access=No está autorizado para fusionar de este pull request.
1439-
pulls.merge_pull_request=Fusionar Pull Request
1440-
pulls.rebase_merge_pull_request=Hacer Rebase y Fusionar
1441-
pulls.rebase_merge_commit_pull_request=Hacer Rebase y Fusionar (--no-ff)
1442-
pulls.squash_merge_pull_request=Hacer Squash y Fusionar
14431439
pulls.merge_manually=Fusionado manualmente
14441440
pulls.merge_commit_id=La identificación del commit fusionado
14451441
pulls.require_signed_wont_sign=Esta rama requiere commits firmados pero esta fusión no será firmada

‎options/locale/locale_fa-IR.ini‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,10 +1162,6 @@ pulls.no_merge_helper=گزینه های ادغام را در تنظیمات مخ
11621162
pulls.no_merge_wip=این تقاضای واکشی قابل ادغام نیست لذا اکنون به این مخزن درحال پردازش علامت گذاری شده است.
11631163
pulls.no_merge_not_ready=این درخواست واکشی آماده ادغام نیست، وضعیت بازبینی را چک کنید.
11641164
pulls.no_merge_access=شما مجاز به ادغام این درخواست واکشی نیستید.
1165-
pulls.merge_pull_request=ادغام تقاضای واکشی
1166-
pulls.rebase_merge_pull_request=بازگردانی و ادغام
1167-
pulls.rebase_merge_commit_pull_request=بازگردانی و ادغام (--no-ff)
1168-
pulls.squash_merge_pull_request=له کردن و ادغام
11691165
pulls.require_signed_wont_sign=انشعاب نیازمند تغییرات امضا شده است اما این ادغام امضا نخواهد شد
11701166
pulls.invalid_merge_option=شما نمی‌توانید از این گزینه برای تقاضای واکشی استفاده کنید.
11711167
; </summary><code>%[2]s<br>%[3]s</code></details>

0 commit comments

Comments
 (0)