mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-07 07:47:02 +02:00
Fixes related to prior merge
This commit is contained in:
4 files changed
+5
-6
No files matched your search
@@ -3187,8 +3187,8 @@ config.open_with_editor_app_help = The "Open with" editors for the clone menu. I
|
|||||||
config.repository_config = Repository Configuration
|
config.repository_config = Repository Configuration
|
||||||
config.enable_size_limit = Enable Size Limit
|
config.enable_size_limit = Enable Size Limit
|
||||||
config.repo_size_limit = Default Repository Size Limit
|
config.repo_size_limit = Default Repository Size Limit
|
||||||
config.invalid_repo_size = Invalid repository size.
|
config.invalid_repo_size = Invalid repository size %s
|
||||||
config.save_repo_size_setting_failed = Failed to save global repository settings
|
config.save_repo_size_setting_failed = Failed to save global repository settings %s
|
||||||
config.repository_setting_success = Global repository setting has been updated
|
config.repository_setting_success = Global repository setting has been updated
|
||||||
|
|
||||||
config.git_config = Git Configuration
|
config.git_config = Git Configuration
|
||||||
|
|||||||
@@ -76,7 +76,6 @@ func UpdateRepoPost(ctx *context.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
err = setting.SaveGlobalRepositorySetting(form.EnableSizeLimit, repoSizeLimit)
|
err = setting.SaveGlobalRepositorySetting(form.EnableSizeLimit, repoSizeLimit)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Data["Err_Repo_Size_Save"] = err.Error()
|
ctx.Data["Err_Repo_Size_Save"] = err.Error()
|
||||||
explore.RenderRepoSearch(ctx, &explore.RepoSearchOptions{
|
explore.RenderRepoSearch(ctx, &explore.RepoSearchOptions{
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"code.gitea.io/gitea/models/unittest"
|
"code.gitea.io/gitea/models/unittest"
|
||||||
"code.gitea.io/gitea/modules/contexttest"
|
"code.gitea.io/gitea/services/contexttest"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -155,13 +155,13 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
|
|||||||
ctx.Data["Page"] = pager
|
ctx.Data["Page"] = pager
|
||||||
|
|
||||||
if ctx.Data["Err_Repo_Size_Limit"] != nil {
|
if ctx.Data["Err_Repo_Size_Limit"] != nil {
|
||||||
ctx.RenderWithErr(ctx.Tr("admin.config.invalid_repo_size")+" "+ctx.Data["Err_Repo_Size_Limit"].(string),
|
ctx.RenderWithErr(ctx.Tr("admin.config.invalid_repo_size", ctx.Data["Err_Repo_Size_Limit"].(string)),
|
||||||
opts.TplName, nil)
|
opts.TplName, nil)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if ctx.Data["Err_Repo_Size_Save"] != nil {
|
if ctx.Data["Err_Repo_Size_Save"] != nil {
|
||||||
ctx.RenderWithErr(ctx.Tr("admin.config.save_repo_size_setting_failed")+" "+ctx.Data["Err_Repo_Size_Save"].(string),
|
ctx.RenderWithErr(ctx.Tr("admin.config.save_repo_size_setting_failed", ctx.Data["Err_Repo_Size_Save"].(string)),
|
||||||
opts.TplName, nil)
|
opts.TplName, nil)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user