Skip to content

Commit c3b347e

Browse files
lunnylunny
authored
Merge branch 'main' into ssh-init
2 parents 6273955 + a9e66cf commit c3b347e

13 files changed

+18
-13
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ require (
8787
github.com/urfave/cli v1.22.9
8888
github.com/xanzy/go-gitlab v0.64.0
8989
github.com/yohcop/openid-go v1.0.0
90-
github.com/yuin/goldmark v1.4.12
90+
github.com/yuin/goldmark v1.4.13
9191
github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594
9292
github.com/yuin/goldmark-meta v1.1.0
9393
go.jolheiser.com/hcaptcha v0.0.4

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,8 +1550,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
15501550
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
15511551
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
15521552
github.com/yuin/goldmark v1.4.5/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
1553-
github.com/yuin/goldmark v1.4.12 h1:6hffw6vALvEDqJ19dOJvJKOoAOKe4NDaTqvd2sktGN0=
1554-
github.com/yuin/goldmark v1.4.12/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
1553+
github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
1554+
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
15551555
github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594 h1:yHfZyN55+5dp1wG7wDKv8HQ044moxkyGq12KFFMFDxg=
15561556
github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594/go.mod h1:U9ihbh+1ZN7fR5Se3daSPoz1CGF9IYtSvWwVQtnzGHU=
15571557
github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc=

‎options/locale/locale_de-DE.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,6 @@ default_branch=Standardbranch
861861
default_branch_helper=Der default Branch ist der Basisbranch für Pull-Requests und Commits.
862862
mirror_prune=Entfernen
863863
mirror_prune_desc=Entferne veraltete remote-tracking Referenzen
864-
mirror_interval=Mirror-Intervall. Gültige Zeiteinheiten sind 'h', 'm', sowie 's'. 0 deaktiviert die automatische Synchronisierung. (Minimum: %s)
865864
mirror_interval_invalid=Das Spiegel-Intervall ist ungültig.
866865
mirror_address=Klonen via URL
867866
mirror_address_desc=Gib alle erforderlichen Anmeldedaten im Abschnitt "Authentifizierung" ein.

‎options/locale/locale_el-GR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,6 @@ default_branch=Προεπιλεγμένος Κλάδος
861861
default_branch_helper=Ο προεπιλεγμένος κλάδος είναι ο βασικός κλάδος για pull requests και υποβολές κώδικα.
862862
mirror_prune=Καθαρισμός
863863
mirror_prune_desc=Αφαίρεση παρωχημένων αναφορών απομακρυσμένης-παρακολούθησης
864-
mirror_interval=Διάστημα ανανέωσης ειδώλου (έγκυρες μονάδες ώρας είναι 'h', 'm', 's'). 0 για απενεργοποίηση του αυτόματου συγχρονισμού. (Ελάχιστο διάστημα: %s)
865864
mirror_interval_invalid=Το χρονικό διάστημα του ειδώλου δεν είναι έγκυρο.
866865
mirror_address=Κλωνοποίηση Από Το URL
867866
mirror_address_desc=Τοποθετήστε όλα τα απαιτούμενα διαπιστευτήρια στην ενότητα Εξουσιοδότηση.

‎options/locale/locale_en-US.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,6 +1303,7 @@ issues.previous = Previous
13031303
issues.next = Next
13041304
issues.open_title = Open
13051305
issues.closed_title = Closed
1306+
issues.draft_title = Draft
13061307
issues.num_comments = %d comments
13071308
issues.commented_at = `commented <a href="#%s">%s</a>`
13081309
issues.delete_comment_confirm = Are you sure you want to delete this comment?

‎options/locale/locale_es-ES.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,8 +861,9 @@ default_branch=Rama por defecto
861861
default_branch_helper=La rama por defecto es la rama base para pull requests y commits de código.
862862
mirror_prune=Purgar
863863
mirror_prune_desc=Eliminar referencias de seguimiento de remotes obsoletas
864-
mirror_interval=Intervalo de replicación (las unidades de tiempo válidas son «h», «m» y «s»). 0 desactiva la sincronización automática. (Intervalo mínimo: %s)
864+
mirror_interval=Intervalo de réplica (Las unidades de tiempo válidas son 'h', 'm', 's'). 0 para deshabilitar la sincronización automática. (Intervalo mínimo: %s)
865865
mirror_interval_invalid=El intervalo de réplica no es válido.
866+
mirror_sync_on_commit=Sincronizar cuando los commits sean subidos
866867
mirror_address=Clonar desde URL
867868
mirror_address_desc=Ponga cualquier credencial requerida en la sección de Autorización.
868869
mirror_address_url_invalid=La url proporcionada no es válida. Debe escapar correctamente de todos los componentes de la url.

‎options/locale/locale_ja-JP.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,6 @@ default_branch=デフォルトブランチ
861861
default_branch_helper=デフォルトブランチはプルリクエストとコードコミットのベースブランチとなります。
862862
mirror_prune=Prune
863863
mirror_prune_desc=不要になった古いリモートトラッキング参照を削除
864-
mirror_interval=ミラー間隔 (有効な時間の単位は'h'、'm'、's')。 自動的な同期を無効にする場合は0。(最小間隔: %s)
865864
mirror_interval_invalid=ミラー間隔が不正です。
866865
mirror_address=クローンするURL
867866
mirror_address_desc=必要な資格情報は「認証」セクションに設定してください。

‎options/locale/locale_lv-LV.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,6 @@ default_branch=Noklusējuma atzars
861861
default_branch_helper=Noklusētais atzars nosaka pamata atzaru uz kuru tiks veidoti izmaiņu pieprasījumi un koda revīziju iesūtīšana.
862862
mirror_prune=Izmest
863863
mirror_prune_desc=Izdzēst visas ārējās atsauces, kas ārējā repozitorijā vairs neeksistē
864-
mirror_interval=Spoguļošanas intervāls (derīgas laika vienības ir 'h', 'm', 's'). Norādiet 0, lai atslēgtu automātisku spoguļošanu. (Minimālais intervāls: %s)
865864
mirror_interval_invalid=Nekorekts spoguļošanas intervāls.
866865
mirror_address=Spoguļa adrese
867866
mirror_address_desc=Pieslēgšanās rekvizītus norādiet autorizācijas sadaļā.

‎options/locale/locale_pt-PT.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,8 +861,9 @@ default_branch=Ramo principal
861861
default_branch_helper=O ramo principal é o ramo base para pedidos de integração e cometimentos.
862862
mirror_prune=Podar
863863
mirror_prune_desc=Remover referências obsoletas de seguimento remoto
864-
mirror_interval=Intervalo entre sincronizações (as unidades de tempo válidas são 'h', 'm' e 's'). O valor zero desabilita a sincronização automática. (Intervalo mínimo: %s)
864+
mirror_interval=Intervalo entre sincronizações (as unidades de tempo válidas são 'h', 'm' e 's'). O valor zero desabilita a sincronização periódica. (Intervalo mínimo: %s)
865865
mirror_interval_invalid=O intervalo entre sincronizações não é válido.
866+
mirror_sync_on_commit=Sincronizar quando forem enviados cometimentos
866867
mirror_address=Clonar a partir do URL
867868
mirror_address_desc=Coloque, na secção de Autorização, as credenciais que, eventualmente, sejam necessárias.
868869
mirror_address_url_invalid=O URL fornecido é inválido. Tem que codificar adequadamente todos os componentes do URL.

‎options/locale/locale_zh-CN.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,6 @@ default_branch=默认分支
861861
default_branch_helper=默认分支是用于合并请求和代码提交的基础分支。
862862
mirror_prune=修剪
863863
mirror_prune_desc=删除过时的远程跟踪引用
864-
mirror_interval=镜像间隔 (有效的时间单位是 'h', 'm', 's')。0 禁用自动同步 (最短间隔: %s)
865864
mirror_interval_invalid=镜像间隔无效。
866865
mirror_address=从URL克隆
867866
mirror_address_desc=在授权框中输入必要的凭据。

‎options/locale/locale_zh-TW.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,6 @@ default_branch=預設分支
861861
default_branch_helper=預設分支是合併請求和提交程式碼的基礎分支。
862862
mirror_prune=裁減
863863
mirror_prune_desc=刪除過時的遠端追蹤參考
864-
mirror_interval=鏡像間隔 (有效時間單位為 'h'、'm'、's')，設為 0 以停用自動同步。(最小間隔: %s)
865864
mirror_interval_invalid=鏡像週期無效
866865
mirror_address=從 URL Clone
867866
mirror_address_desc=在授權資訊中填入必要的資料。

‎templates/repo/issue/view_title.tmpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424
{{else if .Issue.IsClosed}}
2525
<div class="ui red large label">{{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}</div>
2626
{{else if .Issue.IsPull}}
27-
<div class="ui green large label">{{svg "octicon-git-pull-request"}} {{.locale.Tr "repo.issues.open_title"}}</div>
27+
{{if .IsPullWorkInProgress}}
28+
<div class="ui grey large label">{{svg "octicon-git-pull-request-draft"}} {{.locale.Tr "repo.issues.draft_title"}}</div>
29+
{{else}}
30+
<div class="ui green large label">{{svg "octicon-git-pull-request"}} {{.locale.Tr "repo.issues.open_title"}}</div>
31+
{{end}}
2832
{{else}}
2933
<div class="ui green large label">{{svg "octicon-issue-opened"}} {{.locale.Tr "repo.issues.open_title"}}</div>
3034
{{end}}

‎templates/shared/issuelist.tmpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
{{if .IsClosed}}
1818
{{svg "octicon-git-pull-request" 16 "text red"}}
1919
{{else}}
20-
{{svg "octicon-git-pull-request" 16 "text green"}}
20+
{{if .PullRequest.IsWorkInProgress}}
21+
{{svg "octicon-git-pull-request-draft" 16 "text grey"}}
22+
{{else}}
23+
{{svg "octicon-git-pull-request" 16 "text green"}}
24+
{{end}}
2125
{{end}}
2226
{{end}}
2327
{{else}}

0 commit comments

Comments
 (0)