Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix all possible setting error related storages and added some tests #23911

Merged
merged 57 commits into from
Jun 14, 2023
Merged
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
02747fe
Fix all possible setting error related storages and added some tests
lunny Apr 4, 2023
ae66d8f
Fix copyright year and some documentations
lunny Apr 4, 2023
c98d78f
Merge branch 'main' into lunny/storage_bug_fix
lunny Apr 4, 2023
f70d4c6
Fix lint
lunny Apr 4, 2023
b8bbccf
Merge branch 'main' into lunny/storage_bug_fix
lunny Apr 4, 2023
40407b5
add some comments for getStorage
lunny Apr 10, 2023
d45b3af
Merge branch 'main' into lunny/storage_bug_fix
lunny Apr 10, 2023
35f2a41
Merge branch 'main' into lunny/storage_bug_fix
lunny Apr 10, 2023
7d16902
Fix bug
lunny Apr 10, 2023
7cdd5f8
Merge branch 'main' into lunny/storage_bug_fix
lunny Apr 10, 2023
f7b93f3
Merge branch 'main' into lunny/storage_bug_fix
6543 Apr 11, 2023
0e173c2
Merge branch 'main' into lunny/storage_bug_fix
6543 Apr 11, 2023
31300e7
Merge branch 'main' into lunny/storage_bug_fix
6543 Apr 12, 2023
e85e9fb
Update modules/setting/storage.go
lunny Apr 12, 2023
36d49ff
merge main branch
lunny Apr 27, 2023
7f61c62
merge
lunny Apr 27, 2023
fb1ed84
Merge branch 'main' into lunny/storage_bug_fix
6543 Apr 28, 2023
d08c714
merge main branch
lunny May 4, 2023
751d639
Merge branch 'lunny/storage_bug_fix' of github.com:lunny/gitea into l…
lunny May 4, 2023
48113e1
Remove support for [actions] storage type because actions may have ma…
lunny May 4, 2023
49ed138
Fix lint
lunny May 5, 2023
531eadb
Merge branch 'main' into lunny/storage_bug_fix
lunny May 5, 2023
a781649
Fix read storage configuration from actions
lunny May 5, 2023
a4bd69c
Merge branch 'main' into lunny/storage_bug_fix
lunny May 5, 2023
93714fd
refactor getStorage function
lunny May 5, 2023
163d086
Fix comment
lunny May 5, 2023
d9ab5a0
Merge branch 'main' into lunny/storage_bug_fix
lunny May 5, 2023
fa85e06
Fix storage override sequence
lunny May 6, 2023
f4db800
Merge branch 'main' into lunny/storage_bug_fix
lunny May 6, 2023
e3aa03e
Improve getStorage
lunny May 7, 2023
3e641b9
Merge branch 'main' into lunny/storage_bug_fix
lunny May 7, 2023
7f6369a
Fix override
lunny May 7, 2023
f139b8c
Fix storage
lunny May 8, 2023
2e28ce3
merge main branch
lunny May 14, 2023
e9853b1
Use explicit storage
lunny May 14, 2023
40f21cf
Merge branch 'main' into lunny/storage_bug_fix
lunny May 14, 2023
910bb3c
merge main branch
lunny May 22, 2023
a73e619
revert getstorage change
lunny Jun 2, 2023
f23e15e
merge main branch
lunny Jun 3, 2023
1309698
Merge branch 'main' into lunny/storage_bug_fix
lunny Jun 4, 2023
eb1368a
Merge branch 'main' into lunny/storage_bug_fix
lunny Jun 6, 2023
26e3aef
Fix all tests
lunny Jun 7, 2023
9ecc419
Merge branch 'main' into lunny/storage_bug_fix
lunny Jun 7, 2023
793936d
Fix lint
lunny Jun 7, 2023
82b4ec2
Remove unused interface
lunny Jun 7, 2023
a055e53
improve code
lunny Jun 7, 2023
a4fe93f
Fix test
lunny Jun 8, 2023
9bee6b8
Merge branch 'main' into lunny/storage_bug_fix
lunny Jun 8, 2023
c113c60
shadow possible token leak
lunny Jun 8, 2023
10169b9
Merge branch 'main' into lunny/storage_bug_fix
lunny Jun 8, 2023
1a7a50b
Follow wxiaoguang's suggestion
lunny Jun 8, 2023
9461c21
fix
lunny Jun 8, 2023
a772b6c
update storage configuration documents
lunny Jun 8, 2023
0f85d05
Merge branch 'main' into lunny/storage_bug_fix
lunny Jun 13, 2023
e47fb07
Follow wxiaoguang's suggestion
lunny Jun 13, 2023
2d5726b
Follow wxiaoguang's suggestion
lunny Jun 13, 2023
47e7b1b
Merge branch 'main' into lunny/storage_bug_fix
GiteaBot Jun 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix lint
  • Loading branch information
lunny committed Apr 4, 2023
commit f70d4c632649706f77f38a55d18092a58e4767d5
16 changes: 12 additions & 4 deletions modules/setting/setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -265,18 +265,26 @@ func loadCommonSettingsFrom(cfg ConfigProvider) error {
loadSSHFrom(cfg)
loadOAuth2From(cfg)
loadSecurityFrom(cfg)
loadAttachmentFrom(cfg)
loadLFSFrom(cfg)
if err := loadAttachmentFrom(cfg); err != nil {
return err
}
if err := loadLFSFrom(cfg); err != nil {
return err
}
loadTimeFrom(cfg)
loadRepositoryFrom(cfg)
if err := loadAvatarsFrom(cfg); err != nil {
return err
}
loadRepoAvatarFrom(cfg)
if err := loadRepoAvatarFrom(cfg); err != nil {
return err
}
if err := loadPackagesFrom(cfg); err != nil {
return err
}
loadActionsFrom(cfg)
if err := loadActionsFrom(cfg); err != nil {
return err
}
loadUIFrom(cfg)
loadAdminFrom(cfg)
loadAPIFrom(cfg)
Expand Down