Skip to content

Commit 799cd8b

Browse files
authored
Merge branch 'master' into 13682-review-requested-filter
2 parents 3edbbf2 + c09e11d commit 799cd8b

Some content is hidden

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

47 files changed

+212
-280
lines changed

cmd/serv.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func setup(logPath string, debug bool) {
5858
}
5959
setting.NewContext()
6060
if debug {
61-
setting.ProdMode = false
61+
setting.RunMode = "dev"
6262
}
6363
}
6464

@@ -76,7 +76,7 @@ func fail(userMessage, logMessage string, args ...interface{}) {
7676
fmt.Fprintln(os.Stderr, "Gitea:", userMessage)
7777

7878
if len(logMessage) > 0 {
79-
if !setting.ProdMode {
79+
if !setting.IsProd() {
8080
fmt.Fprintf(os.Stderr, logMessage+"\n", args...)
8181
}
8282
}

custom/conf/app.example.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ MACARON = file
867867
ROUTER_LOG_LEVEL = Info
868868
ROUTER = console
869869
ENABLE_ACCESS_LOG = false
870-
ACCESS_LOG_TEMPLATE = {{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"
870+
ACCESS_LOG_TEMPLATE = {{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.URL.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}"
871871
ACCESS = file
872872
; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
873873
LEVEL = Info

models/models.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ func NewTestEngine() (err error) {
175175
}
176176

177177
x.SetMapper(names.GonicMapper{})
178-
x.SetLogger(NewXORMLogger(!setting.ProdMode))
179-
x.ShowSQL(!setting.ProdMode)
178+
x.SetLogger(NewXORMLogger(!setting.IsProd()))
179+
x.ShowSQL(!setting.IsProd())
180180
return x.StoreEngine("InnoDB").Sync2(tables...)
181181
}
182182

models/webhook.go

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -400,20 +400,6 @@ func GetWebhooksByOrgID(orgID int64, listOptions ListOptions) ([]*Webhook, error
400400
return ws, sess.Find(&ws, &Webhook{OrgID: orgID})
401401
}
402402

403-
// GetDefaultWebhook returns admin-default webhook by given ID.
404-
func GetDefaultWebhook(id int64) (*Webhook, error) {
405-
webhook := &Webhook{ID: id}
406-
has, err := x.
407-
Where("repo_id=? AND org_id=? AND is_system_webhook=?", 0, 0, false).
408-
Get(webhook)
409-
if err != nil {
410-
return nil, err
411-
} else if !has {
412-
return nil, ErrWebhookNotExist{id}
413-
}
414-
return webhook, nil
415-
}
416-
417403
// GetDefaultWebhooks returns all admin-default webhooks.
418404
func GetDefaultWebhooks() ([]*Webhook, error) {
419405
return getDefaultWebhooks(x)
@@ -426,11 +412,11 @@ func getDefaultWebhooks(e Engine) ([]*Webhook, error) {
426412
Find(&webhooks)
427413
}
428414

429-
// GetSystemWebhook returns admin system webhook by given ID.
430-
func GetSystemWebhook(id int64) (*Webhook, error) {
415+
// GetSystemOrDefaultWebhook returns admin system or default webhook by given ID.
416+
func GetSystemOrDefaultWebhook(id int64) (*Webhook, error) {
431417
webhook := &Webhook{ID: id}
432418
has, err := x.
433-
Where("repo_id=? AND org_id=? AND is_system_webhook=?", 0, 0, true).
419+
Where("repo_id=? AND org_id=?", 0, 0).
434420
Get(webhook)
435421
if err != nil {
436422
return nil, err

modules/auth/sso/sspi_windows.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (s *SSPI) Init() error {
5656
Funcs: templates.NewFuncMap(),
5757
Asset: templates.GetAsset,
5858
AssetNames: templates.GetAssetNames,
59-
IsDevelopment: setting.RunMode != "prod",
59+
IsDevelopment: !setting.IsProd(),
6060
})
6161
return nil
6262
}
@@ -95,7 +95,7 @@ func (s *SSPI) VerifyAuthData(req *http.Request, w http.ResponseWriter, store Da
9595
// to login with another authentication method if SSPI authentication
9696
// fails
9797
store.GetData()["Flash"] = map[string]string{
98-
"ErrMsg": err.Error(),
98+
"ErrorMsg": err.Error(),
9999
}
100100
store.GetData()["EnableOpenIDSignIn"] = setting.Service.EnableOpenIDSignIn
101101
store.GetData()["EnableSSPI"] = true

modules/base/tool.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ const sniffLen = 512
3535
// SVGMimeType MIME type of SVG images.
3636
const SVGMimeType = "image/svg+xml"
3737

38-
var svgTagRegex = regexp.MustCompile(`(?s)\A\s*(?:<!--.*?-->\s*)*<svg\b`)
39-
var svgTagInXMLRegex = regexp.MustCompile(`(?s)\A<\?xml\b.*?\?>\s*(?:<!--.*?-->\s*)*<svg\b`)
38+
var svgTagRegex = regexp.MustCompile(`(?si)\A\s*(?:(<!--.*?-->|<!DOCTYPE\s+svg([\s:]+.*?>|>))\s*)*<svg[\s>\/]`)
39+
var svgTagInXMLRegex = regexp.MustCompile(`(?si)\A<\?xml\b.*?\?>\s*(?:(<!--.*?-->|<!DOCTYPE\s+svg([\s:]+.*?>|>))\s*)*<svg[\s>\/]`)
4040

4141
// EncodeMD5 encodes string to md5 hex value.
4242
func EncodeMD5(str string) string {

modules/base/tool_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,9 @@ func TestIsSVGImageFile(t *testing.T) {
216216
assert.True(t, IsSVGImageFile([]byte(`<!-- Multiline
217217
Comment -->
218218
<svg></svg>`)))
219+
assert.True(t, IsSVGImageFile([]byte(`<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN"
220+
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
221+
<svg></svg>`)))
219222
assert.True(t, IsSVGImageFile([]byte(`<?xml version="1.0" encoding="UTF-8"?>
220223
<!-- Comment -->
221224
<svg></svg>`)))
@@ -227,6 +230,11 @@ func TestIsSVGImageFile(t *testing.T) {
227230
<!-- Multline
228231
Comment -->
229232
<svg></svg>`)))
233+
assert.True(t, IsSVGImageFile([]byte(`<?xml version="1.0" encoding="UTF-8"?>
234+
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
235+
<!-- Multline
236+
Comment -->
237+
<svg></svg>`)))
230238
assert.False(t, IsSVGImageFile([]byte{}))
231239
assert.False(t, IsSVGImageFile([]byte("svg")))
232240
assert.False(t, IsSVGImageFile([]byte("<svgfoo></svgfoo>")))

modules/httpcache/httpcache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
// GetCacheControl returns a suitable "Cache-Control" header value
1919
func GetCacheControl() string {
20-
if setting.RunMode == "dev" {
20+
if !setting.IsProd() {
2121
return "no-store"
2222
}
2323
return "private, max-age=" + strconv.FormatInt(int64(setting.StaticCacheTime.Seconds()), 10)

modules/setting/setting.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,6 @@ var (
376376
CustomConf string
377377
PIDFile = "/run/gitea.pid"
378378
WritePIDFile bool
379-
ProdMode bool
380379
RunMode string
381380
RunUser string
382381
IsWindows bool
@@ -388,6 +387,11 @@ var (
388387
UILocation = time.Local
389388
)
390389

390+
// IsProd if it's a production mode
391+
func IsProd() bool {
392+
return strings.EqualFold(RunMode, "prod")
393+
}
394+
391395
func getAppPath() (string, error) {
392396
var appPath string
393397
var err error

options/locale/locale_cs-CZ.ini

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1997,8 +1997,6 @@ dashboard=Přehled
19971997
users=Uživatelské účty
19981998
organizations=Organizace
19991999
repositories=Repozitáře
2000-
hooks=Výchozí webové háčky
2001-
systemhooks=Systémové webové háčky
20022000
authentication=Zdroje ověření
20032001
emails=Uživatelské e-maily
20042002
config=Nastavení
@@ -2148,11 +2146,8 @@ repos.forks=Rozštěpení
21482146
repos.issues=Úkoly
21492147
repos.size=Velikost
21502148

2151-
hooks.desc=Webové háčky automaticky vytvářejí HTTP POST dotazy na server při určitých Gitea událostech. Webové háčky definované zde jsou výchozí a budou zkopírovány do všech nových repozitářů. Přečtěte si více v <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">průvodci webovými háčky</a>.
2152-
hooks.add_webhook=Přidat výchozí webový háček
2153-
hooks.update_webhook=Aktualizovat výchozí webový háček
21542149

2155-
systemhooks.desc=Webové háčky automaticky vytvářejí HTTP POST dotazy na server při určitých Gitea událostech. Webové háčky definované zde budou vykonány na všech repozitářích systému, proto prosím zvažte jakékoli důsledky, které to může mít na výkon. Přečtěte si více v <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">průvodci webovými háčky</a>.
2150+
systemhooks=Systémové webové háčky
21562151
systemhooks.add_webhook=Přidat systémový webový háček
21572152
systemhooks.update_webhook=Aktualizovat systémový webový háček
21582153

options/locale/locale_de-DE.ini

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1990,8 +1990,6 @@ dashboard=Dashboard
19901990
users=Benutzerkonten
19911991
organizations=Organisationen
19921992
repositories=Repositories
1993-
hooks=Standard-Webhooks
1994-
systemhooks=System-Webhooks
19951993
authentication=Authentifizierungsquellen
19961994
emails=Benutzer E-Mails
19971995
config=Konfiguration
@@ -2141,11 +2139,8 @@ repos.forks=Forks
21412139
repos.issues=Issues
21422140
repos.size=Größe
21432141

2144-
hooks.desc=Webhooks stellen automatisch HTTP POST-Anfragen an einen Server, wenn bestimmte Gitea-Ereignisse ausgelöst werden. Die hier definierten Webhooks sind Standardwerte und werden in alle neuen Repositories kopiert. Mehr Infos findest du in der <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">Webhooks-Anleitung</a>.
2145-
hooks.add_webhook=Standard-Webhook hinzufügen
2146-
hooks.update_webhook=Standard-Webhook aktualisieren
21472142

2148-
systemhooks.desc=Webhooks senden automatisch POST-HTTP-Anfragen an einen anderen Server, wenn ein bestimmtes Gitea-Event ausgelöst wird. Webhook-Events können von allen Repositories ausgelöst werden, beachte daher mögliche Leistungs-Implikationen. Mehr Informationen sind in der <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">Webhook-Anleitung in der Dokumentation</a> zu finden.
2143+
systemhooks=System-Webhooks
21492144
systemhooks.add_webhook=System-Webhook hinzufügen
21502145
systemhooks.update_webhook=System-Webhook aktualisieren
21512146

options/locale/locale_en-US.ini

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2002,8 +2002,7 @@ dashboard = Dashboard
20022002
users = User Accounts
20032003
organizations = Organizations
20042004
repositories = Repositories
2005-
hooks = Default Webhooks
2006-
systemhooks = System Webhooks
2005+
hooks = Webhooks
20072006
authentication = Authentication Sources
20082007
emails = User Emails
20092008
config = Configuration
@@ -2153,11 +2152,13 @@ repos.forks = Forks
21532152
repos.issues = Issues
21542153
repos.size = Size
21552154

2156-
hooks.desc = Webhooks automatically make HTTP POST requests to a server when certain Gitea events trigger. Webhooks defined here are defaults and will be copied into all new repositories. Read more in the <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">webhooks guide</a>.
2157-
hooks.add_webhook = Add Default Webhook
2158-
hooks.update_webhook = Update Default Webhook
2155+
defaulthooks = Default Webhooks
2156+
defaulthooks.desc = Webhooks automatically make HTTP POST requests to a server when certain Gitea events trigger. Webhooks defined here are defaults and will be copied into all new repositories. Read more in the <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">webhooks guide</a>.
2157+
defaulthooks.add_webhook = Add Default Webhook
2158+
defaulthooks.update_webhook = Update Default Webhook
21592159

2160-
systemhooks.desc = Webhooks automatically make HTTP POST requests to a server when certain Gitea events trigger. Webhooks defined will act on all repositories on the system, so please consider any performance implications this may have. Read more in the <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">webhooks guide</a>.
2160+
systemhooks = System Webhooks
2161+
systemhooks.desc = Webhooks automatically make HTTP POST requests to a server when certain Gitea events trigger. Webhooks defined here will act on all repositories on the system, so please consider any performance implications this may have. Read more in the <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">webhooks guide</a>.
21612162
systemhooks.add_webhook = Add System Webhook
21622163
systemhooks.update_webhook = Update System Webhook
21632164

options/locale/locale_es-ES.ini

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1986,8 +1986,6 @@ dashboard=Panel de control
19861986
users=Cuenta de Usuario
19871987
organizations=Organizaciones
19881988
repositories=Repositorios
1989-
hooks=Webhooks por defecto
1990-
systemhooks=Webhooks del sistema
19911989
authentication=Orígenes de autenticación
19921990
emails=Correos de usuario
19931991
config=Configuración
@@ -2136,11 +2134,8 @@ repos.forks=Forks
21362134
repos.issues=Incidencias
21372135
repos.size=Tamaño
21382136

2139-
hooks.desc=Los Webhooks automáticamente hacen peticiones HTTP POST a un servidor cuando ciertos eventos de Gitea se activan. Los ganchos definidos aquí son predeterminados y serán copiados en todos los nuevos repositorios. Leer más en la guía <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">webhooks</a>.
2140-
hooks.add_webhook=Añadir Webhook por defecto
2141-
hooks.update_webhook=Actualizar Webhook por defecto
21422137

2143-
systemhooks.desc=Los webhooks automáticamente hacen peticiones HTTP POST a un servidor cuando ciertos eventos de Gitea se activan. Los webhooks definidos actuarán en todos los repositorios del sistema, así que por favor considere las implicaciones de rendimiento que esto pueda tener. Lea más en la guía de <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">webhooks</a>.
2138+
systemhooks=Webhooks del sistema
21442139
systemhooks.add_webhook=Añadir Webhook del Sistema
21452140
systemhooks.update_webhook=Actualizar Webhook del Sistema
21462141

options/locale/locale_fa-IR.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,7 +1779,6 @@ dashboard=پیشخوان
17791779
users=حساب کاربران
17801780
organizations=تشکیلات
17811781
repositories=مخازن
1782-
hooks=افزودن هوک‌های تحت وب پیش فرض
17831782
authentication=منابع احراز هویت
17841783
config=پیکربندی
17851784
notices=هشدارهای سامانه
@@ -1883,9 +1882,6 @@ repos.forks=انشعاب‌ها
18831882
repos.issues=مسائل
18841883
repos.size=اندازه
18851884

1886-
hooks.desc=هوک تحت وب به صورت خودکار درخواست POST HTTP را به سمت سرور روانه می‌کند زمانی که ماشه رخداد Gitea کشیده شود. هوک تحت وب اینجا به صورت پیش فرض اینجا تعریف شده و برای تمامی مخزن جدید کپی خواهد شد. برای اطلاعات بیشتر به e <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/"> راهنمای هوک تحت وب </a> مراجعه کنید.
1887-
hooks.add_webhook=افزودن هوک تحت وب پیش فرض
1888-
hooks.update_webhook=به روز رسانی هوک تحت وب پیش فرض
18891885

18901886

18911887
auths.auth_manage_panel=مدیریت منابع احراز هویت

options/locale/locale_fr-FR.ini

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1794,8 +1794,6 @@ dashboard=Tableau de bord
17941794
users=Comptes utilisateurs
17951795
organizations=Organisations
17961796
repositories=Dépôts
1797-
hooks=Webhooks par défaut
1798-
systemhooks=Rappels système
17991797
authentication=Sources d'authentification
18001798
emails=Courriels de l'utilisateur
18011799
config=Configuration
@@ -1917,11 +1915,8 @@ repos.forks=Bifurcations
19171915
repos.issues=Tickets
19181916
repos.size=Taille
19191917

1920-
hooks.desc=Les Webhooks font automatiquement une requête HTTP POST à un serveur quand certains événements Gitea sont déclenchés. Les Webhooks définis ici sont ceux par défaut et seront copiés dans tous les nouveaux dépôts. Lire la suite dans le <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">guide sur les Webhooks</a>.
1921-
hooks.add_webhook=Ajouter un Webhook par défaut
1922-
hooks.update_webhook=Modifier un Webhook par défaut
19231918

1924-
systemhooks.desc=Les Webhooks font automatiquement une requête HTTP POST à un serveur quand certains événements Gitea sont déclenchés. Les Webhooks définis ici sont ceux par défaut et seront copiés dans tous les nouveaux dépôts. pour plus d'information voir le <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">guide sur les Webhooks</a>.
1919+
systemhooks=Rappels système
19251920
systemhooks.add_webhook=Ajouter un rappel système
19261921
systemhooks.update_webhook=Mettre à jour un rappel système
19271922

options/locale/locale_it-IT.ini

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1901,8 +1901,6 @@ dashboard=Pannello di Controllo
19011901
users=Account utenti
19021902
organizations=Organizzazioni
19031903
repositories=Repository
1904-
hooks=Webhook predefiniti
1905-
systemhooks=Webhooks di Sistema
19061904
authentication=Fonti di autenticazione
19071905
emails=Email Utente
19081906
config=Configurazione
@@ -2042,10 +2040,8 @@ repos.forks=Fork
20422040
repos.issues=Problemi
20432041
repos.size=Dimensione
20442042

2045-
hooks.desc=I Webhooks effettuano automaticamente richieste HTTP POST ad un server quando si verificano determinati eventi Gitea. I Webhooks definiti qui sono predefiniti e verranno copiati in tutti le nuove repository. Per saperne di più leggi la <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">guida ai webhooks</a>.
2046-
hooks.add_webhook=Aggiungi Webhook predefinito
2047-
hooks.update_webhook=Aggiorna Webhook predefinito
20482043

2044+
systemhooks=Webhooks di Sistema
20492045
systemhooks.add_webhook=Aggiungi Webhook di Sistema
20502046
systemhooks.update_webhook=Aggiorna Webhook di Sistema
20512047

options/locale/locale_ja-JP.ini

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1997,8 +1997,6 @@ dashboard=ダッシュボード
19971997
users=ユーザーアカウント
19981998
organizations=組織
19991999
repositories=リポジトリ
2000-
hooks=デフォルトのWebhooks
2001-
systemhooks=システムWebhook
20022000
authentication=認証ソース
20032001
emails=ユーザーメールアドレス
20042002
config=設定
@@ -2148,11 +2146,8 @@ repos.forks=フォーク
21482146
repos.issues=課題
21492147
repos.size=サイズ
21502148

2151-
hooks.desc=Webhookは、特定のGiteaイベントトリガーが発生した際に、自動的にHTTP POSTリクエストをサーバーへ送信するものです。 ここで定義されたWebhookはデフォルトとなり、全ての新規リポジトリにコピーされます。 詳しくは<a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">webhooks guide</a>をご覧下さい。
2152-
hooks.add_webhook=デフォルトのWebhookを追加
2153-
hooks.update_webhook=デフォルトのWebhookを更新
21542149

2155-
systemhooks.desc=Webhookは、特定のGiteaイベントトリガーが発生した際に、自動的にHTTP POSTリクエストをサーバーへ送信するものです。 ここで定義したWebhookはシステム内のすべてのリポジトリで呼び出されます。 そのため、パフォーマンスに及ぼす影響を考慮したうえで設定してください。 詳しくは<a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">webhooks guide</a>をご覧下さい。
2150+
systemhooks=システムWebhook
21562151
systemhooks.add_webhook=システムWebhookを追加
21572152
systemhooks.update_webhook=システムWebhookを更新
21582153

options/locale/locale_lv-LV.ini

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,8 +1948,6 @@ dashboard=Infopanelis
19481948
users=Lietotāju konti
19491949
organizations=Organizācijas
19501950
repositories=Repozitoriji
1951-
hooks=Noklusēti tīmekļa āķi
1952-
systemhooks=Sistēmas tīmekļa āķi
19531951
authentication=Autentificēšanas avoti
19541952
emails=Lietotāja e-pasts
19551953
config=Konfigurācija
@@ -2098,11 +2096,8 @@ repos.forks=Atdalītie
20982096
repos.issues=Problēmas
20992097
repos.size=Izmērs
21002098
2101-
hooks.desc=Tīmekļa āķi ļauj paziņot ārējiem servisiem par noteiktiem notikumiem, kas notiek Gitea. Kad iestāsies kāds notikums, katram ārējā servisa URL tiks nosūtīts POST pieprasījums. Šeit izveidotie tīmekļa āķi tiks pievienoti visiem jaunajajiem repozitorijiem. Lai uzzinātu sīkāk skatieties <a target="_blank" rel="noopener noreferrer" href="%s">tīmekļa āķu rokasgrāmatā</a>.
2102-
hooks.add_webhook=Pievienot noklusēto tīmekļa āķi
2103-
hooks.update_webhook=Mainīt noklusēto tīmekļa āķi
21042099
2105-
systemhooks.desc=Tīmekļa āķi automātiski veic HTTP POST pieprasījumus uz serveri, kad notiek noteikti Gitea notikumi. Tīmekļa āķi izpildīsies uz visu servera repozitoriju notikumiem, tāpēc būtu jāņem vērā, ka tas var radīt ātrdarbības problēmas. Vairāk par tiem var uzzināt <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">tīmekļa āķu dokumentācijā</a>.
2100+
systemhooks=Sistēmas tīmekļa āķi
21062101
systemhooks.add_webhook=Pievienot sistēmas tīmekļa āķi
21072102
systemhooks.update_webhook=Mainīt sistēmas tīmekļa āķi
21082103

options/locale/locale_nl-NL.ini

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,8 +1948,6 @@ dashboard=Overzicht
19481948
users=Gebruikersacount
19491949
organizations=Organisaties
19501950
repositories=Repositories
1951-
hooks=Standaard Webhooks
1952-
systemhooks=Systeem webhooks
19531951
authentication=Authenticatie bronnen
19541952
emails=Gebruikeremails
19551953
config=Configuratie
@@ -2098,10 +2096,8 @@ repos.forks=Forks
20982096
repos.issues=Kwesties
20992097
repos.size=Grootte
21002098

2101-
hooks.add_webhook=Standaard Webhook toevoegen
2102-
hooks.update_webhook=Standaard Webhook bijwerken
21032099

2104-
systemhooks.desc=Webhooks maken automatisch HTTP POST-verzoeken naar een server wanneer bepaalde Gitea-gebeurtenissen geactiveerd worden. Gedefinieerd webhooks zullen werken op alle repositories van het systeem, dus overweeg eventuele prestatiegevolgen die dit kan hebben. Lees meer in de <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/webhooks/">webhooks gids</a>.
2100+
systemhooks=Systeem webhooks
21052101
systemhooks.add_webhook=Systeem Webhook toevoegen
21062102
systemhooks.update_webhook=Systeem-webhook bijwerken
21072103

0 commit comments

Comments
 (0)