Merge branch 'main' into refactor-ini

techknowlogick · web-flow · commit 32e815b14588 · 2021-05-29T13:49:15.000-04:00
diff --git a/Makefile b/Makefile
@@ -43,6 +43,9 @@ endif
 ifeq ($(OS), Windows_NT)
 	GOFLAGS := -v -buildmode=exe
 	EXECUTABLE ?= gitea.exe
+else ifeq ($(OS), Windows)
+	GOFLAGS := -v -buildmode=exe
+	EXECUTABLE ?= gitea.exe
 else
 	GOFLAGS := -v
 	EXECUTABLE ?= gitea
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
@@ -1145,8 +1145,8 @@ PATH =
 ;;
 ;; When ISSUE_INDEXER_QUEUE_TYPE is levelqueue, this will be the path where the queue will be saved.
 ;; This can be overridden by `ISSUE_INDEXER_QUEUE_CONN_STR`.
-;; default is indexers/issues.queue
-;ISSUE_INDEXER_QUEUE_DIR = indexers/issues.queue
+;; default is queues/common
+;ISSUE_INDEXER_QUEUE_DIR = queues/common
 ;;
 ;; When `ISSUE_INDEXER_QUEUE_TYPE` is `redis`, this will store the redis connection string.
 ;; When `ISSUE_INDEXER_QUEUE_TYPE` is `levelqueue`, this is a directory or additional options of
@@ -1201,7 +1201,7 @@ PATH =
 ;; default to persistable-channel
 ;TYPE = persistable-channel
 ;;
-;; data-dir for storing persistable queues and level queues, individual queues will be named by their type
+;; data-dir for storing persistable queues and level queues, individual queues will default to `queues/common` meaning the queue is shared.
 ;DATADIR = queues/
 ;;
 ;; Default queue length before a channel queue will block
@@ -1231,7 +1231,7 @@ PATH =
 ;TIMEOUT = 15m30s
 ;;
 ;; Create a pool with this many workers
-;WORKERS = 1
+;WORKERS = 0
 ;;
 ;; Dynamically scale the worker pool to at this many workers
 ;MAX_WORKERS = 10
@@ -1243,7 +1243,7 @@ PATH =
 ;BOOST_TIMEOUT = 5m
 ;;
 ;; During a boost add BOOST_WORKERS
-;BOOST_WORKERS = 5
+;BOOST_WORKERS = 1
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
@@ -350,7 +350,7 @@ relation to port exhaustion.
 - `ISSUE_INDEXER_PATH`: **indexers/issues.bleve**: Index file used for issue search; available when ISSUE_INDEXER_TYPE is bleve and elasticsearch.
 - The next 4 configuration values are deprecated and should be set in `queue.issue_indexer` however are kept for backwards compatibility:
 - `ISSUE_INDEXER_QUEUE_TYPE`: **levelqueue**: Issue indexer queue, currently supports:`channel`, `levelqueue`, `redis`.
-- `ISSUE_INDEXER_QUEUE_DIR`: **indexers/issues.queue**: When `ISSUE_INDEXER_QUEUE_TYPE` is `levelqueue`, this will be the path where the queue will be saved.
+- `ISSUE_INDEXER_QUEUE_DIR`: **queues/common**: When `ISSUE_INDEXER_QUEUE_TYPE` is `levelqueue`, this will be the path where the queue will be saved. (Previously this was `indexers/issues.queue`.)
 - `ISSUE_INDEXER_QUEUE_CONN_STR`: **addrs=127.0.0.1:6379 db=0**: When `ISSUE_INDEXER_QUEUE_TYPE` is `redis`, this will store the redis connection string. When `ISSUE_INDEXER_QUEUE_TYPE` is `levelqueue`, this is a directory or additional options of the form `leveldb://path/to/db?option=value&....`, and overrides `ISSUE_INDEXER_QUEUE_DIR`.
 - `ISSUE_INDEXER_QUEUE_BATCH_NUMBER`: **20**: Batch queue number.
 
@@ -370,7 +370,7 @@ relation to port exhaustion.
 ## Queue (`queue` and `queue.*`)
 
 - `TYPE`: **persistable-channel**: General queue type, currently support: `persistable-channel` (uses a LevelDB internally), `channel`, `level`, `redis`, `dummy`
-- `DATADIR`: **queues/**: Base DataDir for storing persistent and level queues. `DATADIR` for individual queues can be set in `queue.name` sections but will default to `DATADIR/`**`name`**.
+- `DATADIR`: **queues/**: Base DataDir for storing persistent and level queues. `DATADIR` for individual queues can be set in `queue.name` sections but will default to `DATADIR/`**`common`**. (Previously each queue would default to `DATADIR/`**`name`**.)
 - `LENGTH`: **20**: Maximal queue size before channel queues block
 - `BATCH_LENGTH`: **20**: Batch data before passing to the handler
 - `CONN_STR`: **redis://127.0.0.1:6379/0**: Connection string for the redis queue type. Options can be set using query params. Similarly LevelDB options can also be set using: **leveldb://relative/path?option=value** or **leveldb:///absolute/path?option=value**, and will override `DATADIR`
@@ -381,11 +381,11 @@ relation to port exhaustion.
 - `MAX_ATTEMPTS`: **10**: Maximum number of attempts to create the wrapped queue
 - `TIMEOUT`: **GRACEFUL_HAMMER_TIME + 30s**: Timeout the creation of the wrapped queue if it takes longer than this to create.
 - Queues by default come with a dynamically scaling worker pool. The following settings configure this:
-- `WORKERS`: **1**: Number of initial workers for the queue.
+- `WORKERS`: **0** (v1.14 and before: **1**): Number of initial workers for the queue. 
 - `MAX_WORKERS`: **10**: Maximum number of worker go-routines for the queue.
 - `BLOCK_TIMEOUT`: **1s**: If the queue blocks for this time, boost the number of workers - the `BLOCK_TIMEOUT` will then be doubled before boosting again whilst the boost is ongoing.
 - `BOOST_TIMEOUT`: **5m**: Boost workers will timeout after this long.
-- `BOOST_WORKERS`: **5**: This many workers will be added to the worker pool if there is a boost.
+- `BOOST_WORKERS`: **1** (v1.14 and before: **5**): This many workers will be added to the worker pool if there is a boost.
 
 ## Admin (`admin`)
 
diff --git a/options/locale/locale_bg-BG.ini b/options/locale/locale_bg-BG.ini
@@ -772,7 +772,6 @@ pulls.merged_as=Тази заявка за сливане е била обеди
 pulls.is_closed=Тази заявка за сливане е затворена.
 pulls.has_merged=Тази заявка за сливане е обединена.
 pulls.title_wip_desc=`<a href="#">Започнете заглавието с <strong>%s</strong></a>, за да предотвратите случайно обединяване на заявката за сливане.`
-pulls.cannot_merge_work_in_progress=Тази завка за сливане е отбелязане като работа в прогрес. Премахнете <strong>%s</strong> представката от заглавието, когато е готова
 pulls.can_auto_merge_desc=Може да се извърши обединяване на тази заявка за сливане.
 pulls.num_conflicting_files_1=%d конфликтен файл
 pulls.num_conflicting_files_n=%d конфликтни файлове
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
@@ -1275,7 +1275,6 @@ pulls.manually_merged=Sloučeno ručně
 pulls.is_closed=Požadavek na natažení byl uzavřen.
 pulls.has_merged=Požadavek na natažení byl sloučen.
 pulls.title_wip_desc=`<a href="#">Začněte název s <strong>%s</strong></a> a zamezíte tak nechtěnému sloučení požadavku na natažení.`
-pulls.cannot_merge_work_in_progress=Požadavek na natažení je označen jako ve vývoji. Odstraňte <strong>%s</strong> prefix z titulku, až bude hotový
 pulls.data_broken=Tento požadavek na natažení je rozbitý kvůli chybějícím informacím o rozštěpení.
 pulls.files_conflicted=Tento požadavek na natažení obsahuje změny, které kolidují s cílovou větví.
 pulls.is_checking=Právě probíhá kontrola konfliktů při sloučení. Zkuste to za chvíli.
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
@@ -1315,7 +1315,6 @@ pulls.manually_merged_as=Dieser Pull Request wurde manuell als <a rel="nofollow"
 pulls.is_closed=Der Pull-Request wurde geschlossen.
 pulls.has_merged=Der Pull-Request wurde gemergt.
 pulls.title_wip_desc=`<a href="#">Beginne den Titel mit <strong>%s</strong></a> um zu verhindern, dass der Pull Request versehentlich gemergt wird.`
-pulls.cannot_merge_work_in_progress=Dieser Pull Request wurde als Work In Progress markiert. Entferne den <strong>%s</strong>-Präfix vom Titel, wenn dieser fertig ist.
 pulls.data_broken=Dieser Pull-Requests ist kaputt, da Fork-Informationen gelöscht wurden.
 pulls.files_conflicted=Dieser Pull-Request hat Änderungen, die im Widerspruch zum Ziel-Branch stehen.
 pulls.is_checking=Die Konfliktprüfung läuft noch. Bitte aktualisiere die Seite in wenigen Augenblicken.
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
@@ -1315,7 +1315,6 @@ pulls.manually_merged_as=El Pull Request se ha fusionado manualmente como <a rel
 pulls.is_closed=El pull request ha sido cerrado.
 pulls.has_merged=El pull request ha sido fusionado.
 pulls.title_wip_desc=`<a href="#">Comience el título con <strong>%s</strong></a> para prevenir que el pull request se fusione accidentalmente.`
-pulls.cannot_merge_work_in_progress=Este pull request está marcado como un trabajo en progreso. Elimine el prefijo <strong>%s</strong> del título cuando esté listo
 pulls.data_broken=Este pull request está rota debido a que falta información del fork.
 pulls.files_conflicted=Este pull request tiene cambios en conflicto con la rama de destino.
 pulls.is_checking=La comprobación de conflicto de fusión está en progreso. Inténtalo de nuevo en unos momentos.
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
@@ -1131,7 +1131,6 @@ pulls.merged_as=تقاضای واکشی <a rel="nofollow" class="ui sha" href="%
 pulls.is_closed=این تقاضای واکشی بسته شد.
 pulls.has_merged=این تقاضای واکشی ادغام شد.
 pulls.title_wip_desc=`<a href="#"> شروع شذع با عنوان <strong>%s</strong></a> برای جلو گیری کردن از تقاضای واکشی که موقع ادغام دچار تصادم میشود.`
-pulls.cannot_merge_work_in_progress=این تقاضای واکشی در حال پردازش است. پیشوند <strong>%s</strong> پس از آنکه آماده شد از عنوانش حذف میشود
 pulls.data_broken=این تقاضای واکشی به دلیل از دست رفتن اطلاعات انشعاب با شکست مواجه شد.
 pulls.files_conflicted=این تقاضای واکشی دارای تغییراتی است که با شاخه هدف تداخل دارد.
 pulls.is_checking=در حال پردازش تداخل در ادغام می‌باشد. لطفاً لحظاتی بعد امتحان کنید.
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
@@ -1310,7 +1310,6 @@ pulls.manually_merged_as=La demande d'ajout a été fusionnée manuellement en t
 pulls.is_closed=La demande de fusion a été fermée.
 pulls.has_merged=La pull request a été fusionnée.
 pulls.title_wip_desc=`<a href="#">Préfixer le titre par <strong>%s</strong></a> pour empêcher cette demande d'ajout d'être fusionnée par erreur.`
-pulls.cannot_merge_work_in_progress=Cette demande d'ajout est marquée comme en cours de chantier. Retirer le préfixe <strong>%s</strong> du titre quand elle sera prête
 pulls.data_broken=Cette demande de fusion est impossible par manque d'informations de bifurcation.
 pulls.files_conflicted=Cette demande d'ajout contient des modifications en conflit avec la branche ciblée.
 pulls.is_checking=Vérification des conflits de fusion en cours. Réessayez dans quelques instants.
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
@@ -1239,7 +1239,6 @@ pulls.manually_merged=Unito manualmente
 pulls.is_closed=La pull request è stata chiusa.
 pulls.has_merged=La pull request è stata unita.
 pulls.title_wip_desc=`<a href="#">Inizia il titolo con <strong>%s</strong></a> per evitare che la pull request venga unita accidentalmente.`
-pulls.cannot_merge_work_in_progress=Questa pull request è contrassegnata come un lavoro in corso. Rimuovi il prefisso <strong>%s</strong> dal titolo quando è pronta
 pulls.data_broken=Questa pull request è rovinata a causa di informazioni mancanti del fork.
 pulls.files_conflicted=Questa pull request ha modifiche in conflitto con il branch di destinazione.
 pulls.is_checking=Verifica dei conflitti di merge in corso. Riprova tra qualche istante.
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
@@ -1315,7 +1315,6 @@ pulls.manually_merged_as=プルリクエストは <a rel="nofollow" class="ui sh
 pulls.is_closed=プルリクエストはクローズされています。
 pulls.has_merged=プルリクエストはマージされています。
 pulls.title_wip_desc=`誤ってマージされないようにするには、<a href="#">タイトルの頭に <strong>%s</strong> を付けます</a>。`
-pulls.cannot_merge_work_in_progress=このプルリクエストはWork in Progressとマークされています。 マージできる状態になったら、タイトルから <strong>%s</strong> を消してください。
 pulls.data_broken=このプルリクエストは、フォークの情報が見つからないため壊れています。
 pulls.files_conflicted=このプルリクエストは、ターゲットブランチと競合する変更を含んでいます。
 pulls.is_checking=マージのコンフリクトを確認中です。 少し待ってからもう一度実行してください。
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
@@ -1291,7 +1291,6 @@ pulls.manually_merged_as=Izmaiņu pieprasījums tika sapludināts manuāli ar re
 pulls.is_closed=Izmaiņu pieprasījums tika aizvērts.
 pulls.has_merged=Šis izmaiņu pieprasījums tika veiksmīgi sapludināts.
 pulls.title_wip_desc=`<a href="#">Sāciet virsrakstu ar <strong>%s</strong></a>, lai ierobežotu, ka izmaiņu pieprasījums netīšām tiktu sapludināts.`
-pulls.cannot_merge_work_in_progress=Šis izmaiņu pieprasījums ir atzīmēts, ka pie tā vēl notiek izstrāde. Noņemiet <strong>%s</strong> no virsraksta sākuma, kad tas ir pabeigts.
 pulls.data_broken=Izmaiņu pieprasījums ir bojāts, jo dzēsta informācija no atdalītā repozitorija.
 pulls.files_conflicted=Šīs izmaiņu pieprasījuma izmaiņas konfliktē ar mērķa atzaru.
 pulls.is_checking=Notiek konfliktu pārbaude, mirkli uzgaidiet un atjaunojiet lapu.
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
@@ -1216,7 +1216,6 @@ pulls.merged_as=De pull request is samengevoegd als <a rel="nofollow" class="ui
 pulls.is_closed=Deze pull-aanvraag is gesloten.
 pulls.has_merged=Deze pull-aanvraag is al samengevoegd.
 pulls.title_wip_desc=`<a href="#">Start de titel met <strong>%s</strong></a> om te voorkomen dat deze pull-aanvraag per ongeluk wordt samengevoegd.`
-pulls.cannot_merge_work_in_progress=Deze pull-aanvraag is als "work in progress" gemarkeerd. Verwijder de <strong>%s</strong>-prefix van de titel zodra hij klaar is
 pulls.data_broken=Deze pull-aanvraag is ongeldig wegens missende fork-informatie.
 pulls.files_conflicted=Dit pull request heeft wijzigingen die strijdig zijn met de doel branch.
 pulls.is_checking=Controle op samenvoegingsconflicten is nog bezig. Probeer later nog een keer.
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
@@ -1153,7 +1153,6 @@ pulls.merged_as=Pull Request został scalony jako <a rel="nofollow" class="ui sh
 pulls.is_closed=Pull Request został zamknięty.
 pulls.has_merged=Pull Request został scalony.
 pulls.title_wip_desc=`<a href="#">Poprzedź tytuł przy pomocy <strong>%s</strong></a>, aby zapobiec przypadkowemu scaleniu tego Pull Requesta.`
-pulls.cannot_merge_work_in_progress=Ten Pull Request został oznaczony jako praca w toku. Usuń prefiks <strong>%s</strong> z tytułu, kiedy będzie już gotowy.
 pulls.data_broken=Ten Pull Request jest uszkodzony ze względu na brakujące informacje o forku.
 pulls.files_conflicted=Ten Pull Request zawiera zmiany konfliktujące z docelową gałęzią.
 pulls.is_checking=Sprawdzanie konfliktów ze scalaniem w toku. Spróbuj ponownie za chwilę.
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
@@ -1237,7 +1237,6 @@ pulls.merged_as=O pull request teve merge aplicado como <a rel="nofollow" class=
 pulls.is_closed=O pull request foi fechado.
 pulls.has_merged=O merge deste pull request foi aplicado.
 pulls.title_wip_desc=`<a href="#">Inicie o título com o prefixo <strong>%s</strong></a> para prevenir o merge do pull request até que o mesmo esteja pronto.`
-pulls.cannot_merge_work_in_progress=Este pull request está marcado como um trabalho em andamento. Remova o prefixo <strong>%s</strong> do título quando estiver pronto
 pulls.data_broken=Este pull request está quebrado devido a falta de informação do fork.
 pulls.files_conflicted=Este pull request tem alterações conflitantes com o branch de destino.
 pulls.is_checking=Verificação de conflitos do merge está em andamento. Tente novamente em alguns momentos.
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -1305,7 +1305,6 @@ pulls.manually_merged_as=A integração constante neste pedido foi executada man
 pulls.is_closed=O pedido de integração foi fechado.
 pulls.has_merged=A integração constante no pedido foi executada.
 pulls.title_wip_desc=`<a href="#">Inicie o título com <strong>%s</strong></a> para evitar que o pedido de integração seja executado acidentalmente.`
-pulls.cannot_merge_work_in_progress=Este pedido de integração está marcado como um trabalho em andamento. Remova o prefixo <strong>%s</strong> do título quando estiver pronto
 pulls.data_broken=Este pedido de integração está danificado devido à falta de informação da derivação.
 pulls.files_conflicted=Este pedido de integração contém modificações que entram em conflito com o ramo de destino.
 pulls.is_checking=Está em andamento uma verificação de conflitos na integração. Tente novamente daqui a alguns momentos.
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
@@ -1293,7 +1293,6 @@ pulls.manually_merged_as=Pull request был объединён вручную,
 pulls.is_closed=Слияние этого запроса успешно завершено.
 pulls.has_merged=Слияние этого запроса успешно завершено.
 pulls.title_wip_desc=`<a href="#">Добавьте <strong>%s</strong> в начало заголовка</a> для защиты от случайного досрочного принятия Pull Request'а.`
-pulls.cannot_merge_work_in_progress=Данный Pull Request помечен как находящийся ещё в разработке. Удалите <strong>%s</strong> из названия после завершения работы над ним
 pulls.data_broken=Содержимое этого запроса было нарушено вследствие удаления информации форка.
 pulls.files_conflicted=Этот Pull Request имеет изменения, конфликтующие с целевой веткой.
 pulls.is_checking=Продолжается проверка конфликтов, пожалуйста обновите страницу несколько позже.
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
@@ -1173,7 +1173,6 @@ pulls.merged_as=Pull-förfrågan har sammanfogats som <a rel="nofollow" class="u
 pulls.is_closed=Pull-förfrågan har stängts.
 pulls.has_merged=Pull-requested har blivit mergad.
 pulls.title_wip_desc=`<a href="#">Börja titeln med <strong>%s</strong></a> för att förhindra att pull-förfrågan sammanfogas av misstag`
-pulls.cannot_merge_work_in_progress=Denna pull-förfrågan är markerad som ett pågående arbete. Ta bort prefixet <strong>%s</strong> från titeln när den är klar
 pulls.data_broken=Pull-requesten är trasig pågrund av oexisterande information on forken.
 pulls.files_conflicted=Den här pull-förfrågan ha ändringar som är i konflikt med mål-branchen.
 pulls.is_checking=Merge-konfliktkontroll pågår. Försök igen senare.
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
@@ -1315,7 +1315,6 @@ pulls.manually_merged_as=Değişiklik isteği <a rel="nofollow" class="ui sha" h
 pulls.is_closed=Değişiklik isteği kapatıldı.
 pulls.has_merged=Değişiklik isteği birleştirildi.
 pulls.title_wip_desc=`Değişiklik isteğinin yanlışlıkla birleştirilmesini önlemek için, <a href="#">başlığı <strong>%s</strong> ile başlatın</a>`
-pulls.cannot_merge_work_in_progress=Bu değişiklik isteği devam eden bir çalışma olarak işaretlendi. Hazır olduğunda <strong>%s</strong> ön ekini başlıktan kaldırın
 pulls.data_broken=Bu değişiklik isteği, çatallama bilgilerinin eksik olması nedeniyle bozuldu.
 pulls.files_conflicted=Bu değişiklik isteğinde, hedef dalla çakışan değişiklikler var.
 pulls.is_checking=Birleştirme çakışması denetimi devam ediyor. Birkaç dakika sonra tekrar deneyin.
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl
