Skip to content

Commit 56b09e1

Browse files
techknowlogicktechknowlogick
authored
Merge branch 'main' into webhook-empty-body
2 parents 238cd46 + a9daebc commit 56b09e1

25 files changed

+44
-103
lines changed

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ endif
4343
ifeq ($(OS), Windows_NT)
4444
GOFLAGS := -v -buildmode=exe
4545
EXECUTABLE ?= gitea.exe
46+
else ifeq ($(OS), Windows)
47+
GOFLAGS := -v -buildmode=exe
48+
EXECUTABLE ?= gitea.exe
4649
else
4750
GOFLAGS := -v
4851
EXECUTABLE ?= gitea

‎cmd/web.go‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"code.gitea.io/gitea/modules/graceful"
1717
"code.gitea.io/gitea/modules/log"
1818
"code.gitea.io/gitea/modules/setting"
19-
"code.gitea.io/gitea/modules/util"
2019
"code.gitea.io/gitea/routers"
2120
"code.gitea.io/gitea/routers/routes"
2221

@@ -152,19 +151,6 @@ func setPort(port string) error {
152151
case setting.FCGI:
153152
case setting.FCGIUnix:
154153
default:
155-
// Save LOCAL_ROOT_URL if port changed
156-
cfg := ini.Empty()
157-
isFile, err := util.IsFile(setting.CustomConf)
158-
if err != nil {
159-
log.Fatal("Unable to check if %s is a file", err)
160-
}
161-
if isFile {
162-
// Keeps custom settings if there is already something.
163-
if err := cfg.Append(setting.CustomConf); err != nil {
164-
return fmt.Errorf("Failed to load custom conf '%s': %v", setting.CustomConf, err)
165-
}
166-
}
167-
168154
defaultLocalURL := string(setting.Protocol) + "://"
169155
if setting.HTTPAddr == "0.0.0.0" {
170156
defaultLocalURL += "localhost"
@@ -173,10 +159,10 @@ func setPort(port string) error {
173159
}
174160
defaultLocalURL += ":" + setting.HTTPPort + "/"
175161

176-
cfg.Section("server").Key("LOCAL_ROOT_URL").SetValue(defaultLocalURL)
177-
if err := cfg.SaveTo(setting.CustomConf); err != nil {
178-
return fmt.Errorf("Error saving generated LOCAL_ROOT_URL to custom config: %v", err)
179-
}
162+
// Save LOCAL_ROOT_URL if port changed
163+
setting.CreateOrAppendToCustomConf(func(cfg *ini.File) {
164+
cfg.Section("server").Key("LOCAL_ROOT_URL").SetValue(defaultLocalURL)
165+
})
180166
}
181167
return nil
182168
}

‎modules/migrations/gitea_uploader.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
252252

253253
// calc NumCommits if no draft
254254
if !release.Draft {
255-
commit, err := g.gitRepo.GetCommit(rel.TagName)
255+
commit, err := g.gitRepo.GetTagCommit(rel.TagName)
256256
if err != nil {
257257
return fmt.Errorf("GetCommit: %v", err)
258258
}

‎modules/setting/lfs.go‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ package setting
66

77
import (
88
"encoding/base64"
9-
"os"
10-
"path/filepath"
119
"time"
1210

1311
"code.gitea.io/gitea/modules/generate"
1412
"code.gitea.io/gitea/modules/git"
1513
"code.gitea.io/gitea/modules/log"
16-
"code.gitea.io/gitea/modules/util"
1714

1815
ini "gopkg.in/ini.v1"
1916
)
@@ -64,27 +61,9 @@ func newLFSService() {
6461
}
6562

6663
// Save secret
67-
cfg := ini.Empty()
68-
isFile, err := util.IsFile(CustomConf)
69-
if err != nil {
70-
log.Error("Unable to check if %s is a file. Error: %v", CustomConf, err)
71-
}
72-
if isFile {
73-
// Keeps custom settings if there is already something.
74-
if err := cfg.Append(CustomConf); err != nil {
75-
log.Error("Failed to load custom conf '%s': %v", CustomConf, err)
76-
}
77-
}
78-
79-
cfg.Section("server").Key("LFS_JWT_SECRET").SetValue(LFS.JWTSecretBase64)
80-
81-
if err := os.MkdirAll(filepath.Dir(CustomConf), os.ModePerm); err != nil {
82-
log.Fatal("Failed to create '%s': %v", CustomConf, err)
83-
}
84-
if err := cfg.SaveTo(CustomConf); err != nil {
85-
log.Fatal("Error saving generated JWT Secret to custom config: %v", err)
86-
return
87-
}
64+
CreateOrAppendToCustomConf(func(cfg *ini.File) {
65+
cfg.Section("server").Key("LFS_JWT_SECRET").SetValue(LFS.JWTSecretBase64)
66+
})
8867
}
8968
}
9069
}

‎modules/setting/setting.go‎

Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -793,27 +793,10 @@ func NewContext() {
793793
log.Fatal("error generating JWT secret: %v", err)
794794
return
795795
}
796-
cfg := ini.Empty()
797-
isFile, err := util.IsFile(CustomConf)
798-
if err != nil {
799-
log.Error("Unable to check if %s is a file. Error: %v", CustomConf, err)
800-
}
801-
if isFile {
802-
if err := cfg.Append(CustomConf); err != nil {
803-
log.Error("failed to load custom conf %s: %v", CustomConf, err)
804-
return
805-
}
806-
}
807-
cfg.Section("oauth2").Key("JWT_SECRET").SetValue(OAuth2.JWTSecretBase64)
808796

809-
if err := os.MkdirAll(filepath.Dir(CustomConf), os.ModePerm); err != nil {
810-
log.Fatal("failed to create '%s': %v", CustomConf, err)
811-
return
812-
}
813-
if err := cfg.SaveTo(CustomConf); err != nil {
814-
log.Fatal("error saving generating JWT secret to custom config: %v", err)
815-
return
816-
}
797+
CreateOrAppendToCustomConf(func(cfg *ini.File) {
798+
cfg.Section("oauth2").Key("JWT_SECRET").SetValue(OAuth2.JWTSecretBase64)
799+
})
817800
}
818801
}
819802

@@ -1075,26 +1058,9 @@ func loadOrGenerateInternalToken(sec *ini.Section) string {
10751058
}
10761059

10771060
// Save secret
1078-
cfgSave := ini.Empty()
1079-
isFile, err := util.IsFile(CustomConf)
1080-
if err != nil {
1081-
log.Error("Unable to check if %s is a file. Error: %v", CustomConf, err)
1082-
}
1083-
if isFile {
1084-
// Keeps custom settings if there is already something.
1085-
if err := cfgSave.Append(CustomConf); err != nil {
1086-
log.Error("Failed to load custom conf '%s': %v", CustomConf, err)
1087-
}
1088-
}
1089-
1090-
cfgSave.Section("security").Key("INTERNAL_TOKEN").SetValue(token)
1091-
1092-
if err := os.MkdirAll(filepath.Dir(CustomConf), os.ModePerm); err != nil {
1093-
log.Fatal("Failed to create '%s': %v", CustomConf, err)
1094-
}
1095-
if err := cfgSave.SaveTo(CustomConf); err != nil {
1096-
log.Fatal("Error saving generated INTERNAL_TOKEN to custom config: %v", err)
1097-
}
1061+
CreateOrAppendToCustomConf(func(cfg *ini.File) {
1062+
cfg.Section("security").Key("INTERNAL_TOKEN").SetValue(token)
1063+
})
10981064
}
10991065
return token
11001066
}
@@ -1160,6 +1126,32 @@ func MakeManifestData(appName string, appURL string, absoluteAssetURL string) []
11601126
return bytes
11611127
}
11621128

1129+
// CreateOrAppendToCustomConf creates or updates the custom config.
1130+
// Use the callback to set individual values.
1131+
func CreateOrAppendToCustomConf(callback func(cfg *ini.File)) {
1132+
cfg := ini.Empty()
1133+
isFile, err := util.IsFile(CustomConf)
1134+
if err != nil {
1135+
log.Error("Unable to check if %s is a file. Error: %v", CustomConf, err)
1136+
}
1137+
if isFile {
1138+
if err := cfg.Append(CustomConf); err != nil {
1139+
log.Error("failed to load custom conf %s: %v", CustomConf, err)
1140+
return
1141+
}
1142+
}
1143+
1144+
callback(cfg)
1145+
1146+
if err := os.MkdirAll(filepath.Dir(CustomConf), os.ModePerm); err != nil {
1147+
log.Fatal("failed to create '%s': %v", CustomConf, err)
1148+
return
1149+
}
1150+
if err := cfg.SaveTo(CustomConf); err != nil {
1151+
log.Fatal("error saving to custom config: %v", err)
1152+
}
1153+
}
1154+
11631155
// NewServices initializes the services
11641156
func NewServices() {
11651157
InitDBConfig()

‎options/locale/locale_bg-BG.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,6 @@ pulls.merged_as=Тази заявка за сливане е била обеди
772772
pulls.is_closed=Тази заявка за сливане е затворена.
773773
pulls.has_merged=Тази заявка за сливане е обединена.
774774
pulls.title_wip_desc=`<a href="#">Започнете заглавието с <strong>%s</strong></a>, за да предотвратите случайно обединяване на заявката за сливане.`
775-
pulls.cannot_merge_work_in_progress=Тази завка за сливане е отбелязане като работа в прогрес. Премахнете <strong>%s</strong> представката от заглавието, когато е готова
776775
pulls.can_auto_merge_desc=Може да се извърши обединяване на тази заявка за сливане.
777776
pulls.num_conflicting_files_1=%d конфликтен файл
778777
pulls.num_conflicting_files_n=%d конфликтни файлове

‎options/locale/locale_cs-CZ.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,6 @@ pulls.manually_merged=Sloučeno ručně
12751275
pulls.is_closed=Požadavek na natažení byl uzavřen.
12761276
pulls.has_merged=Požadavek na natažení byl sloučen.
12771277
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í.`
1278-
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ý
12791278
pulls.data_broken=Tento požadavek na natažení je rozbitý kvůli chybějícím informacím o rozštěpení.
12801279
pulls.files_conflicted=Tento požadavek na natažení obsahuje změny, které kolidují s cílovou větví.
12811280
pulls.is_checking=Právě probíhá kontrola konfliktů při sloučení. Zkuste to za chvíli.

‎options/locale/locale_de-DE.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1315,7 +1315,6 @@ pulls.manually_merged_as=Dieser Pull Request wurde manuell als <a rel="nofollow"
13151315
pulls.is_closed=Der Pull-Request wurde geschlossen.
13161316
pulls.has_merged=Der Pull-Request wurde gemergt.
13171317
pulls.title_wip_desc=`<a href="#">Beginne den Titel mit <strong>%s</strong></a> um zu verhindern, dass der Pull Request versehentlich gemergt wird.`
1318-
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.
13191318
pulls.data_broken=Dieser Pull-Requests ist kaputt, da Fork-Informationen gelöscht wurden.
13201319
pulls.files_conflicted=Dieser Pull-Request hat Änderungen, die im Widerspruch zum Ziel-Branch stehen.
13211320
pulls.is_checking=Die Konfliktprüfung läuft noch. Bitte aktualisiere die Seite in wenigen Augenblicken.

‎options/locale/locale_es-ES.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1315,7 +1315,6 @@ pulls.manually_merged_as=El Pull Request se ha fusionado manualmente como <a rel
13151315
pulls.is_closed=El pull request ha sido cerrado.
13161316
pulls.has_merged=El pull request ha sido fusionado.
13171317
pulls.title_wip_desc=`<a href="#">Comience el título con <strong>%s</strong></a> para prevenir que el pull request se fusione accidentalmente.`
1318-
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
13191318
pulls.data_broken=Este pull request está rota debido a que falta información del fork.
13201319
pulls.files_conflicted=Este pull request tiene cambios en conflicto con la rama de destino.
13211320
pulls.is_checking=La comprobación de conflicto de fusión está en progreso. Inténtalo de nuevo en unos momentos.

‎options/locale/locale_fa-IR.ini‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,6 @@ pulls.merged_as=تقاضای واکشی <a rel="nofollow" class="ui sha" href="%
11311131
pulls.is_closed=این تقاضای واکشی بسته شد.
11321132
pulls.has_merged=این تقاضای واکشی ادغام شد.
11331133
pulls.title_wip_desc=`<a href="#"> شروع شذع با عنوان <strong>%s</strong></a> برای جلو گیری کردن از تقاضای واکشی که موقع ادغام دچار تصادم میشود.`
1134-
pulls.cannot_merge_work_in_progress=این تقاضای واکشی در حال پردازش است. پیشوند <strong>%s</strong> پس از آنکه آماده شد از عنوانش حذف میشود
11351134
pulls.data_broken=این تقاضای واکشی به دلیل از دست رفتن اطلاعات انشعاب با شکست مواجه شد.
11361135
pulls.files_conflicted=این تقاضای واکشی دارای تغییراتی است که با شاخه هدف تداخل دارد.
11371136
pulls.is_checking=در حال پردازش تداخل در ادغام می‌باشد. لطفاً لحظاتی بعد امتحان کنید.

0 commit comments

Comments
 (0)