Fix incorrect setting loading order#36735
Merged
wxiaoguang merged 1 commit intogo-gitea:mainfrom Feb 24, 2026
Merged
Conversation
GiteaBot
added
the
lgtm/need 2
wxiaoguang
force-pushed
the
fix-cfg-install-lock
branch
from
86dfdb6 to
734a278
Compare
wxiaoguang
added
type/bug
skip-changelog
wxiaoguang
force-pushed
the
fix-cfg-install-lock
branch
from
734a278 to
db1f63f
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a bug in the settings loading order where InstallLock was being loaded too late in the sequence. The loadOAuth2From function checks the InstallLock variable to determine whether to generate and save JWT secrets, but InstallLock was previously being set inside loadSecurityFrom, which runs AFTER loadOAuth2From. This meant that loadOAuth2From would always see InstallLock as false/uninitialized, causing incorrect behavior.
Changes:
- Move
InstallLockinitialization to the beginning ofloadCommonSettingsFrombefore any other load functions - Remove duplicate
InstallLockassignment fromloadSecurityFrom - Update test to properly set
INSTALL_LOCKin config and remove redundant direct assignment
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| modules/setting/setting.go | Moved InstallLock initialization to the start of loadCommonSettingsFrom (line 112) with explanatory comment |
| modules/setting/security.go | Removed duplicate InstallLock assignment that was causing the incorrect loading order |
| modules/base/tool_test.go | Updated test to include INSTALL_LOCK in config and removed direct InstallLock assignment that was masking the bug |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
silverwind
approved these changes
Feb 24, 2026
GiteaBot
added
lgtm/need 1
lunny
approved these changes
Feb 24, 2026
GiteaBot
added
lgtm/done
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Feb 25, 2026
* giteaofficial/main: Fix path resolving (go-gitea#36734) [skip ci] Updated translations via Crowdin Fix track time list permission check (go-gitea#36662) Fix incorrect setting loading order (go-gitea#36735) Use case-insensitive matching for Git error "Not a valid object name" (go-gitea#36728) feat: Add workflow dependencies visualization (go-gitea#36248)
silverwind
added a commit
to silverwind/gitea
that referenced
this pull request
Feb 26, 2026
* main: (24 commits) Instance-wide (global) info banner and maintenance mode (go-gitea#36571) Add created_by filter to SearchIssues (go-gitea#36670) Inline and lazy-load EasyMDE CSS, fix border colors (go-gitea#36714) Fix release draft access check logic (go-gitea#36720) Change image transparency grid to CSS (go-gitea#36711) Avoid opening new tab when downloading actions logs (go-gitea#36740) Add validation constraints for repository creation fields (go-gitea#36671) Fix SVG height calculation in diff viewer (go-gitea#36748) Fix path resolving (go-gitea#36734) [skip ci] Updated translations via Crowdin Fix track time list permission check (go-gitea#36662) Fix incorrect setting loading order (go-gitea#36735) Use case-insensitive matching for Git error "Not a valid object name" (go-gitea#36728) feat: Add workflow dependencies visualization (go-gitea#36248) Add keyboard shortcuts for repository file and code search (go-gitea#36416) Refactor text utility classes to Tailwind CSS (go-gitea#36703) Prevent redirect bypasses via backslash-encoded paths (go-gitea#36660) Fix force push time-line commit comments of pull request (go-gitea#36653) Fix get release draft permission check (go-gitea#36659) Move `X_FRAME_OPTIONS` setting from `cors` to `security` section (go-gitea#30256) ... # Conflicts: # web_src/css/base.css # web_src/css/index.css
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix #36560 (comment)