Merge branch 'master' into dev-project-board

Author: rogerluo410

.eslintrc

@@ -2,7 +2,6 @@ root: true
 reportUnusedDisableDirectives: true
 
 ignorePatterns:
-  - /web_src/js/vendor
   - /templates/base/head.tmpl
   - /templates/repo/activity.tmpl
   - /templates/repo/view_file.tmpl

custom/conf/app.example.ini

@@ -689,10 +689,12 @@ DEFAULT_ENABLE_TIMETRACKING = true
 ; Default value for AllowOnlyContributorsToTrackTime
 ; Only users with write permissions can track time if this is true
 DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME = true
-; Default value for the domain part of the user's email address in the git log
-; if he has set KeepEmailPrivate to true. The user's email will be replaced with a
-; concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS.
-NO_REPLY_ADDRESS = noreply.%(DOMAIN)s
+; Value for the domain part of the user's email address in the git log if user
+; has set KeepEmailPrivate to true. The user's email will be replaced with a
+; concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS. Default
+; value is "noreply." + DOMAIN, where DOMAIN resolves to the value from server.DOMAIN
+; Note: do not use the <DOMAIN> notation below
+NO_REPLY_ADDRESS = noreply.<DOMAIN>
 ; Show Registration button
 SHOW_REGISTRATION_BUTTON = true
 ; Show milestones dashboard page - a view of all the user's milestones

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -482,7 +482,7 @@ relation to port exhaustion.
 - `DEFAULT_ORG_VISIBILITY`: **public**: Set default visibility mode for organisations, either "public", "limited" or "private".
 - `DEFAULT_ORG_MEMBER_VISIBLE`: **false** True will make the membership of the users visible when added to the organisation.
 - `ALLOW_ONLY_EXTERNAL_REGISTRATION`: **false** Set to true to force registration only using third-party services.
-- `NO_REPLY_ADDRESS`: **DOMAIN** Default value for the domain part of the user's email address in the git log if he has set KeepEmailPrivate to true.
+- `NO_REPLY_ADDRESS`: **noreply.DOMAIN** Value for the domain part of the user's email address in the git log if user has set KeepEmailPrivate to true. DOMAIN resolves to the value in server.DOMAIN.
   The user's email will be replaced with a concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS.
 - `USER_DELETE_WITH_COMMENTS_MAX_TIME`: **0** Minimum amount of time a user must exist before comments are kept when the user is deleted.
 

docs/content/doc/advanced/mail-templates-us.md

@@ -130,7 +130,7 @@ did not include a subject part), Gitea's **internal default** will be used.
 The internal default (fallback) subject is the equivalent of:
 
 ```sh
-{{.SubjectPrefix}}[{{.Repo}}] {{.Issue.Title}} (#.Issue.Index)
+{{.SubjectPrefix}}[{{.Repo}}] {{.Issue.Title}} (#{{.Issue.Index}})
 ```
 
 For example: `Re: [mike/stuff] New color palette (#38)`

modules/git/diff.go

@@ -47,7 +47,7 @@ func GetRawDiffForFile(repoPath, startCommit, endCommit string, diffType RawDiff
 func GetRepoRawDiffForFile(repo *Repository, startCommit, endCommit string, diffType RawDiffType, file string, writer io.Writer) error {
 	commit, err := repo.GetCommit(endCommit)
 	if err != nil {
-		return fmt.Errorf("GetCommit: %v", err)
+		return err
 	}
 	fileArgs := make([]string, 0)
 	if len(file) > 0 {

modules/graceful/manager_windows.go

@@ -68,17 +68,19 @@ func (g *Manager) start() {
 	// Set the running state
 	g.setState(stateRunning)
 	if skip, _ := strconv.ParseBool(os.Getenv("SKIP_MINWINSVC")); skip {
+		log.Trace("Skipping SVC check as SKIP_MINWINSVC is set")
 		return
 	}
 
 	// Make SVC process
 	run := svc.Run
-	isInteractive, err := svc.IsWindowsService()
+	isWindowsService, err := svc.IsWindowsService()
 	if err != nil {
-		log.Error("Unable to ascertain if running as an Interactive Session: %v", err)
+		log.Error("Unable to ascertain if running as an Windows Service: %v", err)
 		return
 	}
-	if isInteractive {
+	if !isWindowsService {
+		log.Trace("Not running a service ... using the debug SVC manager")
 		run = debug.Run
 	}
 	go func() {
@@ -94,38 +96,49 @@ func (g *Manager) Execute(args []string, changes <-chan svc.ChangeRequest, statu
 		status <- svc.Status{State: svc.StartPending, WaitHint: uint32(setting.StartupTimeout / time.Millisecond)}
 	}
 
+	log.Trace("Awaiting server start-up")
 	// Now need to wait for everything to start...
 	if !g.awaitServer(setting.StartupTimeout) {
+		log.Trace("... start-up failed ... Stopped")
 		return false, 1
 	}
 
+	log.Trace("Sending Running state to SVC")
+
 	// We need to implement some way of svc.AcceptParamChange/svc.ParamChange
 	status <- svc.Status{
 		State:   svc.Running,
 		Accepts: svc.AcceptStop | svc.AcceptShutdown | acceptHammerCode,
 	}
 
+	log.Trace("Started")
+
 	waitTime := 30 * time.Second
 
 loop:
 	for {
 		select {
 		case <-g.ctx.Done():
+			log.Trace("Shutting down")
 			g.DoGracefulShutdown()
 			waitTime += setting.GracefulHammerTime
 			break loop
 		case <-g.shutdownRequested:
+			log.Trace("Shutting down")
 			waitTime += setting.GracefulHammerTime
 			break loop
 		case change := <-changes:
 			switch change.Cmd {
 			case svc.Interrogate:
+				log.Trace("SVC sent interrogate")
 				status <- change.CurrentStatus
 			case svc.Stop, svc.Shutdown:
+				log.Trace("SVC requested shutdown - shutting down")
 				g.DoGracefulShutdown()
 				waitTime += setting.GracefulHammerTime
 				break loop
 			case hammerCode:
+				log.Trace("SVC requested hammer - shutting down and hammering immediately")
 				g.DoGracefulShutdown()
 				g.DoImmediateHammer()
 				break loop
@@ -134,6 +147,8 @@ loop:
 			}
 		}
 	}
+
+	log.Trace("Sending StopPending state to SVC")
 	status <- svc.Status{
 		State:    svc.StopPending,
 		WaitHint: uint32(waitTime / time.Millisecond),
@@ -145,8 +160,10 @@ hammerLoop:
 		case change := <-changes:
 			switch change.Cmd {
 			case svc.Interrogate:
+				log.Trace("SVC sent interrogate")
 				status <- change.CurrentStatus
 			case svc.Stop, svc.Shutdown, hammerCmd:
+				log.Trace("SVC requested hammer - hammering immediately")
 				g.DoImmediateHammer()
 				break hammerLoop
 			default:
@@ -156,6 +173,8 @@ hammerLoop:
 			break hammerLoop
 		}
 	}
+
+	log.Trace("Stopped")
 	return false, 0
 }
 

modules/public/public.go

@@ -27,6 +27,7 @@ type Options struct {
 // KnownPublicEntries list all direct children in the `public` directory
 var KnownPublicEntries = []string{
 	"css",
+	"fonts",
 	"img",
 	"js",
 	"serviceworker.js",

options/locale/locale_bg-BG.ini

@@ -967,6 +967,7 @@ branch.included=Включено
 
 topic.done=Готово
 
+
 [org]
 org_name_holder=Име на организацията
 org_full_name_holder=Пълно име на организацията

options/locale/locale_cs-CZ.ini

@@ -1933,6 +1933,7 @@ topic.done=Hotovo
 topic.count_prompt=Nelze vybrat více než 25 témat
 topic.format_prompt=Téma musí začínat písmenem nebo číslem, může obsahovat pomlčky („-“) a může být dlouhé až 35 znaků.
 
+
 [org]
 org_name_holder=Název organizace
 org_full_name_holder=Celý název organizace

options/locale/locale_de-DE.ini

@@ -1958,6 +1958,7 @@ topic.done=Fertig
 topic.count_prompt=Du kannst nicht mehr als 25 Themen auswählen
 topic.format_prompt=Themen müssen entweder mit einem Buchstaben oder einer Ziffer beginnen. Sie können Bindestriche („-“) enthalten und bis zu 35 Zeichen lang sein.
 
+
 [org]
 org_name_holder=Name der Organisation
 org_full_name_holder=Vollständiger Name der Organisation

options/locale/locale_es-ES.ini

@@ -1959,6 +1959,7 @@ topic.done=Hecho
 topic.count_prompt=No puede seleccionar más de 25 temas
 topic.format_prompt=Los temas deben comenzar con una letra o número, pueden incluir guiones ('-') y pueden tener hasta 35 caracteres de largo.
 
+
 [org]
 org_name_holder=Nombre de la organización
 org_full_name_holder=Nombre completo de la organización

options/locale/locale_fa-IR.ini

@@ -1665,6 +1665,7 @@ topic.done=انجام شد
 topic.count_prompt=شما نمی توانید بیش از 25 موضوع انتخاب کنید
 topic.format_prompt=موضوع می‌بایستی با حروف یا شماره ها شروع شود. و می‌تواند شامل دَش ('-') باشد و طول آن تا 35 کارکتر نیز امکانپذیر است.
 
+
 [org]
 org_name_holder=نام سازمان
 org_full_name_holder=نام کامل سازمان

options/locale/locale_fi-FI.ini

@@ -980,6 +980,7 @@ branch.delete=Poista haara '%s'
 topic.manage_topics=Hallitse aiheita
 topic.done=Valmis
 
+
 [org]
 org_name_holder=Organisaatio
 org_full_name_holder=Organisaation täydellinen nimi

options/locale/locale_fr-FR.ini

@@ -1847,6 +1847,7 @@ topic.done=Terminé
 topic.count_prompt=Vous ne pouvez pas sélectionner plus de 25 sujets
 topic.format_prompt=Les noms de sujets doivent commencer par une lettre ou un nombre, peuvent contenir des tirets ('-') et peuvent comporter jusqu'à 35 caractères.
 
+
 [org]
 org_name_holder=Nom de l'organisation
 org_full_name_holder=Nom complet de l'organisation

options/locale/locale_hu-HU.ini

@@ -1289,6 +1289,7 @@ branch.deleted_by=Törölve %s által
 topic.manage_topics=Témák kezelése
 topic.done=Kész
 
+
 [org]
 org_name_holder=Szervezet neve
 org_full_name_holder=Szervezet teljes neve

options/locale/locale_id-ID.ini

@@ -1036,6 +1036,7 @@ branch.deleted_by=Dihapus oleh %s
 
 
 
+
 [org]
 org_name_holder=Nama Organisasi
 org_full_name_holder=Organisasi Nama Lengkap

options/locale/locale_it-IT.ini

@@ -1813,6 +1813,7 @@ topic.done=Fatto
 topic.count_prompt=Non puoi selezionare più di 25 argomenti
 topic.format_prompt=Gli argomenti devono iniziare con una lettera o un numero, possono includere trattini ('-') e possono essere lunghi fino a 35 caratteri.
 
+
 [org]
 org_name_holder=Nome dell'Organizzazione
 org_full_name_holder=Nome completo dell'organizzazione

options/locale/locale_ja-JP.ini

@@ -1859,6 +1859,7 @@ diff.whitespace_ignore_at_eol=行末の空白の違いは無視
 diff.stats_desc=<strong>%d個のファイルの変更</strong>、<strong>%d行の追加</strong>、<strong>%d行の削除</strong>
 diff.stats_desc_file=変更 %d 行: 追加 %d 行, 削除 %d 行
 diff.bin=バイナリ
+diff.bin_not_shown=バイナリファイルは表示されません。
 diff.view_file=ファイルの表示
 diff.file_before=変更前
 diff.file_after=変更後
@@ -1959,6 +1960,10 @@ topic.done=完了
 topic.count_prompt=選択できるのは25トピックまでです。
 topic.format_prompt=トピックは、先頭が英数字で、英数字とダッシュ('-')を使用した35文字以内のものにしてください。
 
+error.csv.too_large=このファイルは大きすぎるため表示できません。
+error.csv.unexpected=このファイルは %d 行目の %d 文字目に予期しない文字が含まれているため表示できません。
+error.csv.invalid_field_count=このファイルは %d 行目のフィールドの数が正しくないため表示できません。
+
 [org]
 org_name_holder=組織名
 org_full_name_holder=組織のフルネーム

options/locale/locale_ko-KR.ini

@@ -1195,6 +1195,7 @@ topic.manage_topics=토픽 관리
 topic.done=완료
 topic.count_prompt=25개 이상의 토픽을 선택하실 수 없습니다.
 
+
 [org]
 org_name_holder=조직 이름
 org_full_name_holder=조직 전체 이름

options/locale/locale_lv-LV.ini

@@ -1956,6 +1956,7 @@ topic.done=Gatavs
 topic.count_prompt=Nevar pievienot vairāk kā 25 tēmas
 topic.format_prompt=Tēmai ir jāsākas ar burtu vai ciparu, tā var saturēt domu zīmes ('-') un var būt līdz 35 simboliem gara.
 
+
 [org]
 org_name_holder=Organizācijas nosaukums
 org_full_name_holder=Organizācijas pilnais nosaukums

options/locale/locale_ml-IN.ini

@@ -763,6 +763,7 @@ settings.event_issues=ഇഷ്യൂകള്‍
 
 
 
+
 [org]
 
 

options/locale/locale_nl-NL.ini

@@ -1838,6 +1838,7 @@ topic.done=Klaar
 topic.count_prompt=Je kunt niet meer dan 25 onderwerpen selecteren
 topic.format_prompt=Onderwerpen moeten beginnen met een letter of nummer, kunnen streepjes bevatten ('-') en kunnen maximaal 35 tekens lang zijn.
 
+
 [org]
 org_name_holder=Organisatienaam
 org_full_name_holder=Volledige naam organisatie

options/locale/locale_pl-PL.ini

@@ -1753,6 +1753,7 @@ topic.done=Gotowe
 topic.count_prompt=Nie możesz wybrać więcej, niż 25 tematów
 topic.format_prompt=Tematy muszą się zaczynać od litery lub cyfry, mogą zawierać myślniki ('-') i mogą mieć do 35 znaków.
 
+
 [org]
 org_name_holder=Nazwa organizacji
 org_full_name_holder=Pełna nazwa organizacji

options/locale/locale_pt-BR.ini

@@ -1765,6 +1765,7 @@ topic.done=Feito
 topic.count_prompt=Você não pode selecionar mais de 25 tópicos
 topic.format_prompt=Os tópicos devem começar com uma letra ou um número, podem incluir traços ('-') e podem ter até 35 caracteres.
 
+
 [org]
 org_name_holder=Nome da organização
 org_full_name_holder=Nome completo da organização

options/locale/locale_pt-PT.ini

@@ -1959,6 +1959,7 @@ topic.done=Concluído
 topic.count_prompt=Não pode escolher mais do que 25 tópicos
 topic.format_prompt=Os tópicos devem começar com uma letra ou um número, podem incluir traços ('-') e podem ter até 35 caracteres.
 
+
 [org]
 org_name_holder=Nome da organização
 org_full_name_holder=Nome completo da organização

options/locale/locale_ru-RU.ini

@@ -1958,6 +1958,7 @@ topic.done=Сохранить
 topic.count_prompt=Вы не можете выбрать более 25 тем
 topic.format_prompt=Темы должны начинаться с буквы или цифры, могут содержать дефисы(-) и должны содержать не более 35 символов.
 
+
 [org]
 org_name_holder=Название организации
 org_full_name_holder=Полное название организации

options/locale/locale_sr-SP.ini

@@ -452,6 +452,7 @@ release.downloads=Преузимања
 
 
 
+
 [org]
 org_name_holder=Име организације
 org_full_name_holder=Пун назив организације

options/locale/locale_sv-SE.ini

@@ -1663,6 +1663,7 @@ topic.done=Klar
 topic.count_prompt=Du kan inte välja fler än 25 ämnen
 topic.format_prompt=Ämnen måste starta med en bokstav eller siffra, kan innehålla bindestreck ('-') och vara max 35 tecken långa.
 
+
 [org]
 org_name_holder=Organisationsnamn
 org_full_name_holder=Organisationens Fullständiga Namn

options/locale/locale_tr-TR.ini

@@ -1958,6 +1958,7 @@ topic.done=Bitti
 topic.count_prompt=25'ten fazla konu seçemezsiniz
 topic.format_prompt=Konular bir harf veya rakamla başlamalı, kısa çizgiler ('-') içerebilir ve en fazla 35 karakter uzunluğunda olabilir.
 
+
 [org]
 org_name_holder=Organizasyon Adı
 org_full_name_holder=Organizasyon Tam Adı

options/locale/locale_uk-UA.ini

@@ -1759,6 +1759,7 @@ topic.done=Готово
 topic.count_prompt=Ви не можете вибрати більше 25 тем
 topic.format_prompt=Теми мають розпочинатися з літери або цифри, можуть містити дефіси (-) і не повинні перевищувати 35 символів.
 
+
 [org]
 org_name_holder=Назва організації
 org_full_name_holder=Повна назва організації

options/locale/locale_zh-CN.ini

@@ -1958,6 +1958,7 @@ topic.done=保存
 topic.count_prompt=您最多选择25个主题
 topic.format_prompt=主题必须以字母或数字开头，可以包含连字符 (-)，并且长度不得超过35个字符
 
+
 [org]
 org_name_holder=组织名称
 org_full_name_holder=组织全名

options/locale/locale_zh-HK.ini

@@ -546,6 +546,7 @@ release.downloads=下載附件
 
 
 
+
 [org]
 org_name_holder=組織名稱
 org_full_name_holder=組織全名

options/locale/locale_zh-TW.ini

@@ -1958,6 +1958,7 @@ topic.done=完成
 topic.count_prompt=您最多能選擇 25 個主題
 topic.format_prompt=主題必須以字母或數字為開頭，可包含連接號 ('-') 且最長為 35 個字。
 
+
 [org]
 org_name_holder=組織名稱
 org_full_name_holder=組織全名