From 416ded5f3eed16cf4efb202f2c66db4460dce2c3 Mon Sep 17 00:00:00 2001 From: Fluf <36822577+flufmonster@users.noreply.github.com> Date: Wed, 23 May 2018 01:21:17 -0400 Subject: [PATCH 1/7] Add documentation for reverse proxies (#4022) Fixes #3904 --- .../doc/usage/reverse-proxies.en-us.md | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 docs/content/doc/usage/reverse-proxies.en-us.md diff --git a/docs/content/doc/usage/reverse-proxies.en-us.md b/docs/content/doc/usage/reverse-proxies.en-us.md new file mode 100644 index 0000000000..2fde3ec314 --- /dev/null +++ b/docs/content/doc/usage/reverse-proxies.en-us.md @@ -0,0 +1,102 @@ +--- +date: "2018-05-22T11:00:00+00:00" +title: "Usage: Reverse Proxies" +slug: "reverse-proxies" +weight: 17 +toc: true +draft: false +menu: + sidebar: + parent: "usage" + name: "Reverse Proxies" + weight: 16 + identifier: "reverse-proxies" +--- + +## Using Nginx as a reverse proxy +If you want Nginx to serve your Gitea instance you can the following `server` section inside the `http` section of `nginx.conf`: + +``` +server { + listen 80; + server_name git.example.com; + + location / { + proxy_pass http://localhost:3000; + } +} +``` + +## Using Nginx with a Sub-path as a reverse proxy + +In case you already have a site, and you want Gitea to share the domain name, you can setup Nginx to serve Gitea under a sub-path by adding the following `server` section inside the `http` section of `nginx.conf`: + +``` +server { + listen 80; + server_name git.example.com; + + location /git/ { # Note: Trailing slash + proxy_pass http://localhost:3000/; # Note: Trailing slash + } +} +``` + +Then set `[server] ROOT_URL = http://git.example.com/git/` in your configuration. + +## Using Apache HTTPD as a reverse proxy + +If you want Apache HTTPD to serve your Gitea instance you can add the following to you Apache HTTPD configuration (usually located at `/etc/apache2/httpd.conf` in Ubuntu): + +``` + + ... + ProxyPreserveHost On + ProxyRequests off + ProxyPass / http://localhost:3000/ + ProxyPassReverse / http://localhost:3000/ + +``` + +Note: The following Apache HTTPD mods must be enabled: `proxy`, `proxy_http` + +## Using Apache HTTPD with a Sub-path as a reverse proxy + +In case you already have a site, and you want Gitea to share the domain name, you can setup Apache HTTPD to serve Gitea under a sub-path by adding the following to you Apache HTTPD configuration (usually located at `/etc/apache2/httpd.conf` in Ubuntu): + +``` + + ... + + Order allow,deny + Allow from all + + + ProxyPass /git http://localhost:3000 # Note: no trailing slash after either /git or port + ProxyPassReverse /git http://localhost:3000 # Note: no trailing slash after either /git or port + +``` + +Then set `[server] ROOT_URL = http://git.example.com/git/` in your configuration. + +Note: The following Apache HTTPD mods must be enabled: `proxy`, `proxy_http` + +## Using Caddy with a Sub-path as a reverse proxy + +If you want Caddy to serve your Gitea instance you can add the following server block to your Caddyfile: + +``` +git.example.com { + proxy / http://localhost:3000 +} +``` + +##### How do I set up a sub-path with Caddy? + +In case you already have a site, and you want Gitea to share the domain name, you can setup Caddy to serve Gitea under a sub-path by adding the following to you server block in your Caddyfile: + +``` +git.example.com { + proxy /git/ http://localhost:3000 # Note: Trailing Slash after /git/ +} +``` From a2f0c575845c1c78401fc8fed8d7b98381d2c491 Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Wed, 23 May 2018 05:22:18 +0000 Subject: [PATCH 2/7] [skip ci] Updated translations via Crowdin --- options/locale/locale_bg-BG.ini | 1 - options/locale/locale_cs-CZ.ini | 1 - options/locale/locale_de-DE.ini | 2 -- options/locale/locale_es-ES.ini | 1 - options/locale/locale_fi-FI.ini | 1 - options/locale/locale_fr-FR.ini | 1 - options/locale/locale_hu-HU.ini | 1 - options/locale/locale_id-ID.ini | 1 - options/locale/locale_it-IT.ini | 1 - options/locale/locale_ja-JP.ini | 1 - options/locale/locale_ko-KR.ini | 1 - options/locale/locale_lt-LT.ini | 1 - options/locale/locale_lv-LV.ini | 1 - options/locale/locale_nl-NL.ini | 1 - options/locale/locale_pl-PL.ini | 1 - options/locale/locale_pt-BR.ini | 2 -- options/locale/locale_ru-RU.ini | 1 - options/locale/locale_sr-SP.ini | 1 - options/locale/locale_sv-SE.ini | 1 - options/locale/locale_tr-TR.ini | 1 - options/locale/locale_uk-UA.ini | 1 - options/locale/locale_zh-CN.ini | 2 -- options/locale/locale_zh-HK.ini | 1 - options/locale/locale_zh-TW.ini | 1 - 24 files changed, 27 deletions(-) diff --git a/options/locale/locale_bg-BG.ini b/options/locale/locale_bg-BG.ini index fcfad52000..49b0bda052 100644 --- a/options/locale/locale_bg-BG.ini +++ b/options/locale/locale_bg-BG.ini @@ -59,7 +59,6 @@ test_git_failed=Неуспешно тестването на "git" команд [home] password_holder=Парола switch_dashboard_context=Превключи контекст на таблото -my_repos=Моите хранилища collaborative_repos=Съвместни хранилища my_orgs=Моите организации my_mirrors=Моите огледала diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index 5099321da1..81a561729b 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -59,7 +59,6 @@ test_git_failed=Chyba při testu příkazu 'git': %v [home] password_holder=Heslo switch_dashboard_context=Přepnout kontext přehledu -my_repos=Mé repositáře collaborative_repos=Společné repositáře my_orgs=Mé organizace my_mirrors=Má zrcadla diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 5a639c3ad4..8383014aca 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -168,7 +168,6 @@ no_reply_address_helper=Domain-Namen für Benutzer mit einer versteckten Emailad uname_holder=E-Mail-Adresse oder Benutzername password_holder=Passwort switch_dashboard_context=Kontext der Übersichtsseite wechseln -my_repos=Meine Repositories show_more_repos=Zeige mehr Repositories… collaborative_repos=Gemeinschaftliche Repositories my_orgs=Meine Organisationen @@ -463,7 +462,6 @@ then_enter_passcode=Und gebe dann die angezeigte PIN der Anwendung ein: passcode_invalid=Die PIN ist falsch. Probiere es erneut. twofa_enrolled=Die Zwei-Faktor-Authentifizierung wurde für dein Konto aktiviert. Bewahre dein Einmalpasswort (%s) an einem sicheren Ort auf, da es nicht wieder angezeigt werden wird. -u2f_desc=Hardware-Sicherheitsschlüssel sind Geräte, die kryptografische Schlüssel beinhalten. Diese können für die Zwei-Faktor-Authentifizierung verwendet werden. Der Sicherheitsschlüssel muss den FIDO U2F-Standard unterstützen. u2f_require_twofa=Du musst die Zwei-Faktor-Authentifizierung aktivieren, um Hardware-Sicherheitsschlüssel nutzen zu können. u2f_register_key=Sicherheitsschlüssel hinzufügen u2f_nickname=Nickname diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index 728692f6b4..751cbd44d3 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -69,7 +69,6 @@ save_config_failed=Error al guardar la configuración: %v [home] password_holder=Contraseña switch_dashboard_context=Cambiar el contexto del Dashboard -my_repos=Mis repositorios collaborative_repos=Repositorios colaborativos my_orgs=Mis organizaciones my_mirrors=Mis réplicas diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index 3665568e88..a0c76dd6c7 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -61,7 +61,6 @@ test_git_failed=Epäonnistui testata 'git' komentoa: %v [home] password_holder=Salasana switch_dashboard_context=Vaihda kojelaudan kontekstia -my_repos=Reponi collaborative_repos=Yhteistyö repot my_orgs=Organisaationi my_mirrors=Peilini diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 22872fe05a..c22916dff2 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -70,7 +70,6 @@ save_config_failed=L'enregistrement de la configuration %v a échoué [home] password_holder=Mot de passe switch_dashboard_context=Basculer le contexte du tableau de bord -my_repos=Mes dépôts collaborative_repos=Dépôts collaboratifs my_orgs=Mes organisations my_mirrors=Mes miroirs diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini index eb724a353b..450ae826c2 100644 --- a/options/locale/locale_hu-HU.ini +++ b/options/locale/locale_hu-HU.ini @@ -71,7 +71,6 @@ save_config_failed=Hiba történt a konfiguráció mentése közben: %v [home] password_holder=Jelszó switch_dashboard_context=Műszerfal nézőpont váltás -my_repos=Tárolóim show_more_repos=Több tároló mutatása… collaborative_repos=Együttműködési tárolók my_orgs=Szervezeteim diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini index 9a80bc2323..fb2b261e3d 100644 --- a/options/locale/locale_id-ID.ini +++ b/options/locale/locale_id-ID.ini @@ -70,7 +70,6 @@ save_config_failed=Gagal menyimpan konfigurasi: %v [home] password_holder=Kata Sandi switch_dashboard_context=Alihkan Dasbor Konteks -my_repos=Repositori Saya collaborative_repos=Repositori Kolaboratif my_orgs=Organisasi Saya my_mirrors=Duplikat Saya diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini index b255f65557..af9acccaad 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -70,7 +70,6 @@ save_config_failed=Salvataggio della configurazione non riuscito: %v [home] password_holder=Password switch_dashboard_context=Cambia Dashboard Context -my_repos=I miei Repository collaborative_repos=Repository Condivisi my_orgs=Le mie Organizzazioni my_mirrors=I miei Mirror diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index 03795f39c3..557110b1f4 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -71,7 +71,6 @@ save_config_failed=設定ファイルの保存に失敗しました: %v [home] password_holder=パスワード switch_dashboard_context=ダッシュ ボードのコンテキストを切替 -my_repos=自分のリポジトリ show_more_repos=リポジトリをさらに表示… collaborative_repos=共同リポジトリ my_orgs=自分の組織 diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index c18a36d438..eb17fab5d3 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -70,7 +70,6 @@ save_config_failed=설정을 저장할 수 없습니다: %v [home] password_holder=비밀번호 switch_dashboard_context=대시보드 컨텍스트 바꾸기 -my_repos=내 저장소 collaborative_repos=협업 저장소 my_orgs=내 조직 my_mirrors=내 미러 저장소들 diff --git a/options/locale/locale_lt-LT.ini b/options/locale/locale_lt-LT.ini index fbcb0014cc..8a9f067aba 100644 --- a/options/locale/locale_lt-LT.ini +++ b/options/locale/locale_lt-LT.ini @@ -56,7 +56,6 @@ confirm_password=Patvirtinkite slaptažodį [home] password_holder=Slaptažodis -my_repos=Mano saugyklos my_orgs=Mano organizacijos my_mirrors=Mano veidrodžiai view_home=Rodyti %s diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index eb23d89ee5..d2f34e08ba 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -71,7 +71,6 @@ save_config_failed=Neizdevās saglabāt konfigurāciju: %v [home] password_holder=Parole switch_dashboard_context=Mainīt infopaneļa kontekstu -my_repos=Mani repozitoriji show_more_repos=Parādīt vairāk repozitorijus… collaborative_repos=Sadarbības repozitoriji my_orgs=Manas organizācijas diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index e063255b0a..6815ce6c38 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -71,7 +71,6 @@ save_config_failed=Kan de configuratie niet opslaan: %v [home] password_holder=Wachtwoord switch_dashboard_context=Wissel voorpaginacontext -my_repos=Mijn repositories show_more_repos=Toon meer repositories… collaborative_repos=Gedeelde repositories my_orgs=Mijn organisaties diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index 6f72acea6a..7ed8b47156 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -70,7 +70,6 @@ save_config_failed=Nie udało się zapisać konfiguracji: %v [home] password_holder=Hasło switch_dashboard_context=Przełącz kontekst pulpitu -my_repos=Moje repozytoria collaborative_repos=Wspólne repozytoria my_orgs=Moje organizacje my_mirrors=Moje kopie lustrzane diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 6d13ac54cc..1a9368af0d 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -168,7 +168,6 @@ no_reply_address_helper=Nome de domínio para usuários com um endereço de e-ma uname_holder=Usuário ou e-mail password_holder=Senha switch_dashboard_context=Trocar contexto do painel de controle -my_repos=Meus repositórios show_more_repos=Mostrar mais repositórios… collaborative_repos=Repositórios colaborativos my_orgs=Minhas organizações @@ -463,7 +462,6 @@ then_enter_passcode=E insira a senha mostrada no aplicativo: passcode_invalid=Esse código de acesso é inválido. Tente novamente. twofa_enrolled=Sua conta foi inscrita na autenticação de dois fatores. Armazene seu token de backup (%s) em um local seguro, pois ele é exibido apenas uma vez! -u2f_desc=Chaves de segurança são dispositivos de hardware que contém chaves de criptografia. Elas podem ser usadas para autenticação de dois fatores. A chave de segurança deve suportar o padrão FIDO U2F. u2f_require_twofa=Autenticação de dois fatores deve estar inscrita para usar chaves de segurança. u2f_register_key=Adicionar chave de segurança u2f_nickname=Apelido diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index e3e04dfd90..e19a1c70f1 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -159,7 +159,6 @@ no_reply_address=Скрытый почтовый домен uname_holder=Имя пользователя / Email password_holder=Пароль switch_dashboard_context=Переключить контекст панели управления -my_repos=Мои репозитории show_more_repos=Показать больше репозиториев… collaborative_repos=Совместные репозитории my_orgs=Мои организации diff --git a/options/locale/locale_sr-SP.ini b/options/locale/locale_sr-SP.ini index 0886858041..fa8430e7a4 100644 --- a/options/locale/locale_sr-SP.ini +++ b/options/locale/locale_sr-SP.ini @@ -59,7 +59,6 @@ test_git_failed=Команда 'git' није успела: %v [home] password_holder=Лозинка switch_dashboard_context=Пребаците контекст контролној панели -my_repos=Моја спремишта collaborative_repos=Заједничка спремишта my_orgs=Моје организације my_mirrors=Моја огледала diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index 08a8e7eb91..b735943f64 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -70,7 +70,6 @@ save_config_failed=Misslyckades att spara konfigurationen: %v [home] password_holder=Lösenord switch_dashboard_context=Växla Visad Instrumentpanel -my_repos=Mina utvecklingskataloger collaborative_repos=Kollaborativa Utvecklingskataloger my_orgs=Mina organisationer my_mirrors=Mina speglar diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index 703aa29037..4e33fad25f 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -70,7 +70,6 @@ save_config_failed=%v Yapılandırması kaydedilirken hata oluştu [home] password_holder=Parola switch_dashboard_context=Panoya Geçiş Yap -my_repos=Depolarım collaborative_repos=Katkıya Açık Depolar my_orgs=Organizasyonlarım my_mirrors=Yansılarım diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index e140446cfe..f847ccf0cf 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -147,7 +147,6 @@ no_reply_address=Прихований поштовий домен uname_holder=Ім'я користувача або Ел. пошта password_holder=Пароль switch_dashboard_context=Змінити дошку -my_repos=Мої репозиторії show_more_repos=Показати більше репозиторіїв… collaborative_repos=Спільні репозиторії my_orgs=Мої організації diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 82f410669f..2e90e9e9f0 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -168,7 +168,6 @@ no_reply_address_helper=具有隐藏电子邮件地址的用户的域名。例 uname_holder=登录名或电子邮箱地址 password_holder=密码 switch_dashboard_context=切换控制面板用户 -my_repos=我的仓库 show_more_repos=显示更多仓库… collaborative_repos=参与协作的仓库 my_orgs=我的组织 @@ -463,7 +462,6 @@ then_enter_passcode=并输入应用程序中显示的密码: passcode_invalid=密码不正确。再试一次。 twofa_enrolled=你的账号已经启用了两步验证。请保存初始令牌（%s）到一个安全的地方，此令牌仅当前显示一次。 -u2f_desc=安全密钥是包含加密算法的硬件设备。它们可以用于两步验证。安全密钥必须支持 FIDO U2F 标准。 u2f_require_twofa=必须开启两步验证才能使用安全密钥。 u2f_register_key=添加安全密钥 u2f_nickname=昵称 diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini index 218fbb2f6d..75d6a2db59 100644 --- a/options/locale/locale_zh-HK.ini +++ b/options/locale/locale_zh-HK.ini @@ -67,7 +67,6 @@ save_config_failed=儲存設定失敗：%v [home] password_holder=密碼 switch_dashboard_context=切換控制面版用戶 -my_repos=我的儲存庫 collaborative_repos=參與協作的儲存庫 my_orgs=我的組織 my_mirrors=我的鏡像 diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index 0c6173bdb8..fbe418a7df 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -70,7 +70,6 @@ save_config_failed=儲存設定失敗：%v [home] password_holder=密碼 switch_dashboard_context=切換控制面版用戶 -my_repos=我的儲存庫 collaborative_repos=參與協作的儲存庫 my_orgs=我的組織 my_mirrors=我的鏡像 From 4ec8551490688a887a526f24ba287d30fa409811 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 23 May 2018 14:12:02 +0800 Subject: [PATCH 3/7] fix webhook bug of response info is not displayed in UI (#4000) --- models/webhook.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/models/webhook.go b/models/webhook.go index c44ca2960d..77662f5275 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -494,7 +494,14 @@ func (t *HookTask) AfterLoad() { t.RequestInfo = &HookRequest{} if err := json.Unmarshal([]byte(t.RequestContent), t.RequestInfo); err != nil { - log.Error(3, "Unmarshal[%d]: %v", t.ID, err) + log.Error(3, "Unmarshal RequestContent[%d]: %v", t.ID, err) + } + + if len(t.ResponseContent) > 0 { + t.ResponseInfo = &HookResponse{} + if err := json.Unmarshal([]byte(t.ResponseContent), t.ResponseInfo); err != nil { + log.Error(3, "Unmarshal ResponseContent[%d]: %v", t.ID, err) + } } } @@ -665,6 +672,10 @@ func (t *HookTask) deliver() { log.Trace("Hook delivery failed: %s", t.UUID) } + if err := UpdateHookTask(t); err != nil { + log.Error(4, "UpdateHookTask [%d]: %v", t.ID, err) + } + // Update webhook last delivery status. w, err := GetWebhookByID(t.HookID) if err != nil { @@ -717,10 +728,6 @@ func DeliverHooks() { // Update hook task status. for _, t := range tasks { t.deliver() - - if err := UpdateHookTask(t); err != nil { - log.Error(4, "UpdateHookTask [%d]: %v", t.ID, err) - } } // Start listening on new hook requests. @@ -741,10 +748,6 @@ func DeliverHooks() { } for _, t := range tasks { t.deliver() - if err := UpdateHookTask(t); err != nil { - log.Error(4, "UpdateHookTask [%d]: %v", t.ID, err) - continue - } } } } From 71a8fe3e7c601e9c5e286e2303962a7760d5fb17 Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Wed, 23 May 2018 06:13:29 +0000 Subject: [PATCH 4/7] [skip ci] Updated translations via Crowdin --- options/locale/locale_uk-UA.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index f847ccf0cf..f5f10b0e42 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -147,6 +147,7 @@ no_reply_address=Прихований поштовий домен uname_holder=Ім'я користувача або Ел. пошта password_holder=Пароль switch_dashboard_context=Змінити дошку +my_repos=Репозиторії show_more_repos=Показати більше репозиторіїв… collaborative_repos=Спільні репозиторії my_orgs=Мої організації @@ -625,10 +626,12 @@ issues.cancel_tracking_history=`скасував відстеження часу issues.time_spent_total=Загальний витрачений час issues.time_spent_from_all_authors=`Загальний витрачений час: %s` issues.due_date=Дата завершення +issues.due_date_form=рррр-мм-дд issues.due_date_form_add=Додати дату завершення issues.due_date_form_update=Оновити дату завершення issues.due_date_form_remove=Видалити дату завершення issues.due_date_not_set=Термін виконання не встановлений. +issues.due_date_overdue=Прострочено pulls.new=Новий запит на злиття pulls.compare_changes=Новий запит на злиття @@ -791,6 +794,7 @@ settings.webhook.body=Тіло settings.githook_name=Ім'я хуку settings.githook_content=Зміст хука settings.update_githook=Оновити хук +settings.payload_url=Цільова URL-адреса settings.secret=Секрет settings.slack_username=Ім'я кристувача settings.slack_icon_url=URL іконки @@ -841,6 +845,7 @@ settings.protected_branch_can_push=Дозволити push? settings.protected_branch_can_push_yes=Ви можете виконувати push settings.protected_branch_can_push_no=Ви не можете виконувати push settings.protect_whitelist_search_users=Пошук користувачів… +settings.protect_whitelist_search_teams=Пошук команд… settings.add_protected_branch=Увімкнути захист settings.delete_protected_branch=Вимкнути захист settings.choose_branch=Оберіть гілку… From 60d95a0b858aa0c22bb621cbe079fb70261d594c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 23 May 2018 15:23:23 +0800 Subject: [PATCH 5/7] fix bugs caused by #3929 (#3999) --- routers/repo/webhook.go | 2 +- templates/org/settings/hook_new.tmpl | 12 ++++++------ templates/org/settings/hooks.tmpl | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index 6994aa3344..63450ed887 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -25,7 +25,7 @@ import ( const ( tplHooks base.TplName = "repo/settings/webhook/base" tplHookNew base.TplName = "repo/settings/webhook/new" - tplOrgHookNew base.TplName = "org/settings/webhook/new" + tplOrgHookNew base.TplName = "org/settings/hook_new" ) // Webhooks render web hooks list page diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index bedb2dc142..809009b66b 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -23,14 +23,14 @@
- {{template "repo/settings/hook_gitea" .}} - {{template "repo/settings/hook_gogs" .}} - {{template "repo/settings/hook_slack" .}} - {{template "repo/settings/hook_discord" .}} - {{template "repo/settings/hook_dingtalk" .}} + {{template "repo/settings/webhook/gitea" .}} + {{template "repo/settings/webhook/gogs" .}} + {{template "repo/settings/webhook/slack" .}} + {{template "repo/settings/webhook/discord" .}} + {{template "repo/settings/webhook/dingtalk" .}}
- {{template "repo/settings/hook_history" .}} + {{template "repo/settings/webhook/history" .}} diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl index 9052bf6146..825b1e941d 100644 --- a/templates/org/settings/hooks.tmpl +++ b/templates/org/settings/hooks.tmpl @@ -5,7 +5,7 @@
{{template "org/settings/navbar" .}}
- {{template "repo/settings/hook_list" .}} + {{template "repo/settings/webhook/list" .}}
From b299d7bceb808e2dc4aa2c92ba5310e73c8508a8 Mon Sep 17 00:00:00 2001 From: Fluf <36822577+flufmonster@users.noreply.github.com> Date: Wed, 23 May 2018 11:31:12 -0400 Subject: [PATCH 6/7] Add Environment Variables to Docker template (#4012) * Add disable registration as an environment variable for docker * Add REQUIRE_SIGNIN_VIEW as env var to docker * Add variables to template * Update docker docs --- docker/etc/s6/gitea/setup | 2 ++ docker/etc/templates/app.ini | 4 ++++ docs/content/doc/installation/with-docker.en-us.md | 2 ++ 3 files changed, 8 insertions(+) diff --git a/docker/etc/s6/gitea/setup b/docker/etc/s6/gitea/setup index 6ca9b82123..500cca584c 100755 --- a/docker/etc/s6/gitea/setup +++ b/docker/etc/s6/gitea/setup @@ -35,6 +35,8 @@ if [ ! -f /data/gitea/conf/app.ini ]; then DB_USER=${DB_USER:-"root"} \ DB_PASSWD=${DB_PASSWD:-""} \ INSTALL_LOCK=${INSTALL_LOCK:-"false"} \ + DISABLE_REGISTRATION=${DISABLE_REGISTRATION:-"false"} \ + REQUIRE_SIGNIN_VIEW=${REQUIRE_SIGNIN_VIEW:-"false"} \ SECRET_KEY=${SECRET_KEY:-""} \ envsubst < /etc/templates/app.ini > /data/gitea/conf/app.ini fi diff --git a/docker/etc/templates/app.ini b/docker/etc/templates/app.ini index 2375f8f533..9e0a3dd5c8 100644 --- a/docker/etc/templates/app.ini +++ b/docker/etc/templates/app.ini @@ -38,3 +38,7 @@ ROOT_PATH = /data/gitea/log [security] INSTALL_LOCK = $INSTALL_LOCK SECRET_KEY = $SECRET_KEY + +[service] +DISABLE_REGISTRATION = $DISABLE_REGISTRATION +REQUIRE_SIGNIN_VIEW = $REQUIRE_SIGNIN_VIEW diff --git a/docs/content/doc/installation/with-docker.en-us.md b/docs/content/doc/installation/with-docker.en-us.md index 9494fd6037..8f393f16d0 100644 --- a/docs/content/doc/installation/with-docker.en-us.md +++ b/docs/content/doc/installation/with-docker.en-us.md @@ -243,6 +243,8 @@ You can configure some of Gitea's settings via environment variables: * `DB_PASSWD`: **""**: Database user password. Use \`your password\` for quoting if you use special characters in the password. * `INSTALL_LOCK`: **false**: Disallow access to the install page. * `SECRET_KEY`: **""**: Global secret key. This should be changed. If this has a value and `INSTALL_LOCK` is empty, `INSTALL_LOCK` will automatically set to `true`. +* `DISABLE_REGISTRATION`: **false**: Disable registration, after which only admin can create accounts for users. +* `REQUIRE_SIGNIN_VIEW`: **false**: Enable this to force users to log in to view any page. # Customization From 4ba9745cee8d16755eb3a54d60b1232c2c9e3986 Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Wed, 23 May 2018 15:33:10 +0000 Subject: [PATCH 7/7] [skip ci] Updated translations via Crowdin --- options/locale/locale_pt-BR.ini | 2 ++ options/locale/locale_uk-UA.ini | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 1a9368af0d..e1e2710e65 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -168,6 +168,7 @@ no_reply_address_helper=Nome de domínio para usuários com um endereço de e-ma uname_holder=Usuário ou e-mail password_holder=Senha switch_dashboard_context=Trocar contexto do painel de controle +my_repos=Repositórios show_more_repos=Mostrar mais repositórios… collaborative_repos=Repositórios colaborativos my_orgs=Minhas organizações @@ -462,6 +463,7 @@ then_enter_passcode=E insira a senha mostrada no aplicativo: passcode_invalid=Esse código de acesso é inválido. Tente novamente. twofa_enrolled=Sua conta foi inscrita na autenticação de dois fatores. Armazene seu token de backup (%s) em um local seguro, pois ele é exibido apenas uma vez! +u2f_desc=Chaves de segurança são dispositivos de hardware que contém chaves de criptografia. Elas podem ser usadas para autenticação de dois fatores. A chave de segurança deve suportar o padrão FIDO U2F. u2f_require_twofa=Autenticação de dois fatores deve estar inscrita para usar chaves de segurança. u2f_register_key=Adicionar chave de segurança u2f_nickname=Apelido diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index f5f10b0e42..d5716cab71 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -631,6 +631,7 @@ issues.due_date_form_add=Додати дату завершення issues.due_date_form_update=Оновити дату завершення issues.due_date_form_remove=Видалити дату завершення issues.due_date_not_set=Термін виконання не встановлений. +issues.due_date_added=додав(ла) дату завершення %s %s issues.due_date_overdue=Прострочено pulls.new=Новий запит на злиття @@ -1222,17 +1223,17 @@ notices.desc=Опис notices.op=Оп. [action] -create_repo=створено репозиторій %s +create_repo=створив(ла) репозиторій %s rename_repo=репозиторій перейменовано з %[1]s на %[3]s commit_repo=виконав(ла) push в %[3]s у %[4]s create_issue=`відкрив(ла) проблему %s#%[2]s` close_issue=`закрито проблему %s#%[2]s` reopen_issue=`повторно відкрив(ла) проблему %s#%[2]s` -create_pull_request=`створено запити на злиття %s#%[2]s` -close_pull_request=`закрито запит на злиття %s#%[2]s` +create_pull_request=`створив(ла) запити на злиття %s#%[2]s` +close_pull_request=`закрив(ла) запит на злиття %s#%[2]s` reopen_pull_request=`повторно відкрито запит на злиття %s#%[2]s` comment_issue=`прокоментував(ла) проблему %s#%[2]s` -merge_pull_request=`запит на злиття злито %s#%[2]s` +merge_pull_request=`злив(ла) запит на злиття %s#%[2]s` transfer_repo=перенесено репозиторій %s у %s push_tag=створив(ла) тег %[2]s в %[3]s delete_tag=видалено мітку %[2]s з %[3]s