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

Diff for: ‎.drone.yml

+7-7
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:

Diff for: ‎modules/context/access_log.go

+6-4
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{})

Diff for: ‎modules/context/api.go

+11
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
}

Diff for: ‎modules/context/context.go

+11
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
}

Diff for: ‎modules/csv/csv.go

+2-3
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

Diff for: ‎options/locale/locale_bg-BG.ini

-1
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=Осъвременяване на клона

Diff for: ‎options/locale/locale_cs-CZ.ini

-4
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

Diff for: ‎options/locale/locale_de-DE.ini

-4
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

Diff for: ‎options/locale/locale_es-ES.ini

-4
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

Diff for: ‎options/locale/locale_fa-IR.ini

-4
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>

Diff for: ‎options/locale/locale_fi-FI.ini

-1
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,6 @@ pulls.merged=Yhdistetty
777777
pulls.has_merged=Vetopyyntö on yhdistetty.
778778
pulls.can_auto_merge_desc=Tämä pull-pyyntö voidaan yhdistää automaattisesti.
779779

780-
pulls.merge_pull_request=Yhdistä Pull-pyyntö
781780
; </summary><code>%[2]s<br>%[3]s</code></details>
782781

783782

Diff for: ‎options/locale/locale_fr-FR.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1384,10 +1384,6 @@ pulls.no_merge_helper=Activez des options de fusion dans les paramètres du dép
13841384
pulls.no_merge_wip=Cette demande d'ajout ne peut pas être fusionnée car elle est marquée comme en cours de chantier.
13851385
pulls.no_merge_not_ready=Cette demande d'ajout n'est pas prête à être fusionnée, vérifiez l'état de la revue et les vérifications.
13861386
pulls.no_merge_access=Vous n'êtes pas autorisé-e a fusionnée cette demande d'ajout.
1387-
pulls.merge_pull_request=Fusionner la demande d'ajout
1388-
pulls.rebase_merge_pull_request=Rebase et fusionner
1389-
pulls.rebase_merge_commit_pull_request=Rebase et Fusion (--no-ff)
1390-
pulls.squash_merge_pull_request=Squash et fusionner
13911387
pulls.merge_manually=Fusionné manuellement
13921388
pulls.merge_commit_id=L'ID de la révision de fusion
13931389
pulls.require_signed_wont_sign=La branche nécessite des révisions signées mais cette fusion ne sera pas signée

Diff for: ‎options/locale/locale_hu-HU.ini

-3
Original file line numberDiff line numberDiff line change
@@ -998,9 +998,6 @@ pulls.cant_reopen_deleted_branch=Ez a pull request nem nyitható meg újra, mive
998998
pulls.merged=Egyesítve
999999
pulls.can_auto_merge_desc=Ez az egyesítési kérés automatikusan végrehajtható.
10001000

1001-
pulls.merge_pull_request=Egyesítési kérés végrehajtása
1002-
pulls.rebase_merge_pull_request=Rebase és egyesítés
1003-
pulls.squash_merge_pull_request=Squash és egyesítés
10041001
; </summary><code>%[2]s<br>%[3]s</code></details>
10051002
pulls.status_checking=Néhány ellenőrzés függőben van
10061003
pulls.status_checks_success=Minden ellenőrzés sikeres volt

Diff for: ‎options/locale/locale_id-ID.ini

-3
Original file line numberDiff line numberDiff line change
@@ -861,9 +861,6 @@ pulls.reopen_to_merge=Tolong buka kembali permintaan tarik ini untuk melaksanaka
861861
pulls.merged=Menggabungkan
862862
pulls.can_auto_merge_desc=Permintaan tarik ini dapat digabung secara otomatis.
863863

864-
pulls.merge_pull_request=Gabungkan Permintaan Tarik
865-
pulls.rebase_merge_pull_request=Membuat Ulang Dasar dan Menggabungkan
866-
pulls.squash_merge_pull_request=Tindih dan Gabungkan
867864
; </summary><code>%[2]s<br>%[3]s</code></details>
868865

869866

Diff for: ‎options/locale/locale_it-IT.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1272,10 +1272,6 @@ pulls.no_merge_helper=Attiva le opzioni di merge nelle impostazioni del reposito
12721272
pulls.no_merge_wip=Questa pull request non può essere unita perché è contrassegnata come un lavoro in corso.
12731273
pulls.no_merge_not_ready=Questa pull request non è pronta per il merge, controlla lo stato della revisione e i controlli di stato.
12741274
pulls.no_merge_access=Non sei autorizzato ad effettuare il merge su questa pull request.
1275-
pulls.merge_pull_request=Unisci Pull Request
1276-
pulls.rebase_merge_pull_request=Fai rebase e unisci
1277-
pulls.rebase_merge_commit_pull_request=Rebase e Merge (--no-ff)
1278-
pulls.squash_merge_pull_request=Fai squash e unisci
12791275
pulls.require_signed_wont_sign=Il branch richiede commit firmati ma questo merge non verrà firmato
12801276
pulls.invalid_merge_option=Non puoi utilizzare questa opzione di merge per questa pull request.
12811277
pulls.merge_conflict_summary=Messaggio d'errore

Diff for: ‎options/locale/locale_ja-JP.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1437,10 +1437,6 @@ pulls.no_merge_helper=リポジトリ設定でマージを有効にするか、
14371437
pulls.no_merge_wip=このプルリクエストはWork In Progressとマークされているため、マージすることはできません。
14381438
pulls.no_merge_not_ready=このプルリクエストはマージする準備ができていません。 レビュー状況とステータスチェックを確認してください。
14391439
pulls.no_merge_access=このプルリクエストをマージする権限がありません。
1440-
pulls.merge_pull_request=プルリクエストをマージ
1441-
pulls.rebase_merge_pull_request=リベースしてマージ
1442-
pulls.rebase_merge_commit_pull_request=リベースしてマージ(--no-ff)
1443-
pulls.squash_merge_pull_request=スカッシュしてマージ
14441440
pulls.merge_manually=手動マージ済みにする
14451441
pulls.merge_commit_id=マージコミットID
14461442
pulls.require_signed_wont_sign=ブランチでは署名されたコミットが必須ですが、このマージでは署名がされません

Diff for: ‎options/locale/locale_ko-KR.ini

-4
Original file line numberDiff line numberDiff line change
@@ -887,10 +887,6 @@ pulls.can_auto_merge_desc=이 풀리퀘스트는 자동적으로 머지될 수
887887
pulls.cannot_auto_merge_helper=충돌을 해결하려면 수동으로 머지하십시오.
888888

889889
pulls.no_merge_desc=모든 저장소 머지 옵션이 비활성화 되어있기 때문에 이 풀 리퀘스트를 머지할 수 없습니다.
890-
pulls.merge_pull_request=풀리퀘스트 머지
891-
pulls.rebase_merge_pull_request=리베이스와 머지
892-
pulls.rebase_merge_commit_pull_request=리베이스와 머지 (--no-ff)
893-
pulls.squash_merge_pull_request=스쿼시하고 머지
894890
pulls.invalid_merge_option=이 풀 리퀘스트에서 설정한 머지 옵션을 사용하실 수 없습니다.
895891
; </summary><code>%[2]s<br>%[3]s</code></details>
896892

Diff for: ‎options/locale/locale_lv-LV.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1436,10 +1436,6 @@ pulls.no_merge_helper=Lai sapludinātu šo izmaiņu pieprasījumu, iespējojiet
14361436
pulls.no_merge_wip=Šo izmaiņu pieprasījumu nav iespējams sapludināt, jo tas ir atzīmēts, ka darbs pie tā vēl nav pabeigts.
14371437
pulls.no_merge_not_ready=Izmaiņu pieprasījumu nav iespējams sapludināt, pārbaudiet recenziju statusu un statusa pārbaudes.
14381438
pulls.no_merge_access=Jums nav tiesību sapludināt šo izmaiņu pieprasījumu.
1439-
pulls.merge_pull_request=Izmaiņu pieprasījuma sapludināšana
1440-
pulls.rebase_merge_pull_request=Pārbāzēt un sapludināt
1441-
pulls.rebase_merge_commit_pull_request=Pārbāzēt un sapludināt (--no-ff)
1442-
pulls.squash_merge_pull_request=Saspiest un sapludināt
14431439
pulls.merge_manually=Manuāli sapludināts
14441440
pulls.merge_commit_id=Sapludināšanas revīzijas ID
14451441
pulls.require_signed_wont_sign=Atzarā var iesūtīt tikai parakstītas revīzijas, bet sapludināšanas revīzijas netiks parakstīta

Diff for: ‎options/locale/locale_nl-NL.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1263,10 +1263,6 @@ pulls.no_merge_helper=Schakel samenvoegingsopties in in de repositoryinstellinge
12631263
pulls.no_merge_wip=Deze pull-aanvraag kan niet worden samengevoegd omdat hij als "work in progress" is gemarkeerd.
12641264
pulls.no_merge_not_ready=Deze pull-aanvraag is niet klaar om samen te voegen, controleer de status en status controles.
12651265
pulls.no_merge_access=Je bent niet gemachtigd om deze pull-aanvraag samen te voegen.
1266-
pulls.merge_pull_request=Samenvoegen van pull verzoek
1267-
pulls.rebase_merge_pull_request=Rebase en Merge
1268-
pulls.rebase_merge_commit_pull_request=Rebase en voeg samen (--no-ff)
1269-
pulls.squash_merge_pull_request=Squash en Merge
12701266
pulls.require_signed_wont_sign=De branch heeft ondertekende commits nodig, maar deze merge zal niet worden ondertekend
12711267
pulls.invalid_merge_option=Je kan de samenvoegingsoptie niet gebruiken voor deze pull-aanvraag.
12721268
pulls.merge_conflict=Samenvoegen mislukt: Er was een conflict tijdens het samenvoegen. Hint: Probeer een andere strategie

Diff for: ‎options/locale/locale_pl-PL.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1184,10 +1184,6 @@ pulls.no_merge_helper=Włącz opcje scalania w ustawieniach repozytorium, lub sc
11841184
pulls.no_merge_wip=Ten pull request nie może być automatycznie scalony, ponieważ jest oznaczony jako praca w toku.
11851185
pulls.no_merge_not_ready=Ten Pull Request nie jest gotowy do scalenia, sprawdź status recenzji i kontrolki stanu.
11861186
pulls.no_merge_access=Nie masz uprawnień, aby scalić ten Pull Request.
1187-
pulls.merge_pull_request=Scal Pull Request
1188-
pulls.rebase_merge_pull_request=Zmień bazę i scal
1189-
pulls.rebase_merge_commit_pull_request=Zmień bazę i scal (--no-ff)
1190-
pulls.squash_merge_pull_request=Zmiażdż i scal
11911187
pulls.require_signed_wont_sign=Ta gałąź wymaga podpisanych commitów, ale to scalenie nie będzie podpisane
11921188
pulls.invalid_merge_option=Nie możesz użyć tej opcji scalania dla tego pull request'a.
11931189
; </summary><code>%[2]s<br>%[3]s</code></details>

Diff for: ‎options/locale/locale_pt-BR.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1260,10 +1260,6 @@ pulls.no_merge_helper=Habilite as opções de merge nas configurações do repos
12601260
pulls.no_merge_wip=O merge deste pull request não pode ser aplicado porque está marcado como um trabalho em andamento.
12611261
pulls.no_merge_not_ready=Este pull request não está pronto para ser realizado o merge, verifique o status da revisão e as verificações de status.
12621262
pulls.no_merge_access=Você não está autorizado para realizar o merge deste pull request.
1263-
pulls.merge_pull_request=Aplicar merge do pull request
1264-
pulls.rebase_merge_pull_request=Aplicar Rebase e Merge
1265-
pulls.rebase_merge_commit_pull_request=Aplicar Rebase e Merge (--no-ff)
1266-
pulls.squash_merge_pull_request=Aplicar Squash e Merge
12671263
pulls.require_signed_wont_sign=O branch requer commits assinados, mas este merge não será assinado
12681264
pulls.invalid_merge_option=Você não pode usar esta opção de merge neste pull request.
12691265
; </summary><code>%[2]s<br>%[3]s</code></details>

Diff for: ‎options/locale/locale_pt-PT.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -1437,10 +1437,10 @@ pulls.no_merge_helper=Habilite as opções de integração nas configurações d
14371437
pulls.no_merge_wip=A integração constante neste pedido não pode ser executada porque está marcada como sendo trabalho em andamento.
14381438
pulls.no_merge_not_ready=A integração constante neste pedido não pode ser executada. Verifique o estado da revisão e as verificações de estado.
14391439
pulls.no_merge_access=Não tem autorização para executar a integração constante neste pedido.
1440-
pulls.merge_pull_request=Executar a integração
1441-
pulls.rebase_merge_pull_request=Mudar a base e integrar
1442-
pulls.rebase_merge_commit_pull_request=Mudar a base e integrar (--no-ff)
1443-
pulls.squash_merge_pull_request=Comprimir e integrar
1440+
pulls.merge_pull_request=Criar um cometimento de integração
1441+
pulls.rebase_merge_pull_request=Mudar a base e avançar rapidamente
1442+
pulls.rebase_merge_commit_pull_request=Mudar a base e criar um cometimento de integração
1443+
pulls.squash_merge_pull_request=Criar cometimento de compressão
14441444
pulls.merge_manually=Integrado manualmente
14451445
pulls.merge_commit_id=O ID de cometimento da integração
14461446
pulls.require_signed_wont_sign=O ramo requer que os cometimentos sejam assinados mas esta integração não vai ser assinada

Diff for: ‎options/locale/locale_ru-RU.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1434,10 +1434,6 @@ pulls.no_merge_helper=Включите опции слияния в настро
14341434
pulls.no_merge_wip=Данный Pull Request не может быть принят, поскольку он помечен как находящийся в разработке.
14351435
pulls.no_merge_not_ready=Этот запрос не готов к слиянию, обратите внимания на ревью и проверки.
14361436
pulls.no_merge_access=У вас нет права для слияния данного запроса.
1437-
pulls.merge_pull_request=Принять Pull Request
1438-
pulls.rebase_merge_pull_request=Выполнить rebase и принять PR
1439-
pulls.rebase_merge_commit_pull_request=Выполнить rebase и принять PR (--no-ff)
1440-
pulls.squash_merge_pull_request=Объединить и принять PR
14411437
pulls.merge_manually=Слито вручную
14421438
pulls.merge_commit_id=ID коммита слияния
14431439
pulls.require_signed_wont_sign=Данная ветка ожидает подписанные коммиты, однако слияние не будет подписано

0 commit comments

Comments
 (0)