Skip to content

Commit 7985cde

Browse files
authored
Fix Actions being enabled accidentally (#24802)
Regression of #24536. If the user doesn't explicitly disable Actions, it will be enabled. 1. Gitea will call `loadRepositoryFrom` before `loadActionsFrom`. https://github.com/go-gitea/gitea/blob/25d4f95df25dae5226e96e813dde87b071d9155e/modules/setting/setting.go#L234-L237 2. In `loadRepositoryFrom`, `rootCfg.Section("actions").Key("ENABLED").MustBool(true)` will set `actions.ENABLED` with `true`. https://github.com/go-gitea/gitea/blob/25d4f95df25dae5226e96e813dde87b071d9155e/modules/setting/repository.go#L313-L315 3. In `loadActionsFrom`, `rootCfg.Section("actions")` will get a section with Actions enabled. https://github.com/go-gitea/gitea/blob/25d4f95df25dae5226e96e813dde87b071d9155e/modules/setting/actions.go#L23-L26 Although the cause of the problem was using `true` by copy-paste mistake, it also surprised me that **`rootCfg.Section("actions").Key("ENABLED").MustBool(true)` doesn't only read, but also write.**
1 parent 3eecde3 commit 7985cde

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

modules/setting/repository.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -306,11 +306,11 @@ func loadRepositoryFrom(rootCfg ConfigProvider) {
306306
log.Fatal("Failed to map Repository.PullRequest settings: %v", err)
307307
}
308308

309-
if !rootCfg.Section("packages").Key("ENABLED").MustBool(true) {
309+
if !rootCfg.Section("packages").Key("ENABLED").MustBool(Packages.Enabled) {
310310
Repository.DisabledRepoUnits = append(Repository.DisabledRepoUnits, "repo.packages")
311311
}
312312

313-
if !rootCfg.Section("actions").Key("ENABLED").MustBool(true) {
313+
if !rootCfg.Section("actions").Key("ENABLED").MustBool(Actions.Enabled) {
314314
Repository.DisabledRepoUnits = append(Repository.DisabledRepoUnits, "repo.actions")
315315
}
316316

0 commit comments

Comments
 (0)