luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-01 04:12:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Refactor models.NewRepoContext to extract git related codes to modules/git (#6941)

Browse source 
* refactor models.NewRepoContext to extract git related codes to modules/git

* fix imports

* refactor
This commit is contained in:
Lunny Xiao 2019-05-15 09:57:00 +08:00 • committed by GitHub
parent 95d3d42c5f
commit 710245e81e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/setting/git.go
View file

@ -16,7 +16,6 @@ import (
var (
// Git settings
Git = struct {
Version string `ini:"-"`
DisableDiffHighlight bool
MaxGitDiffLines int
MaxGitDiffLineCharacters int
@ -65,6 +64,8 @@ func newGit() {
log.Fatal("Error retrieving git version: %v", err)
}
log.Info("Git Version: %s", binVersion)
if version.Compare(binVersion, "2.9", ">=") {
// Explicitly disable credential helper, otherwise Git credentials might leak
git.GlobalCommandArgs = append(git.GlobalCommandArgs, "-c", "credential.helper=")

3
modules/setting/setting.go
View file

@ -27,6 +27,7 @@ import (
_ "code.gitea.io/gitea/modules/minwinsvc" // import minwinsvc for windows services
"code.gitea.io/gitea/modules/user"
"github.com/Unknwon/cae/zip"
"github.com/Unknwon/com"
_ "github.com/go-macaron/cache/memcache" // memcache plugin for cache
_ "github.com/go-macaron/cache/redis"
@ -931,6 +932,8 @@ func NewContext() {
sec = Cfg.Section("U2F")
U2F.TrustedFacets, _ = shellquote.Split(sec.Key("TRUSTED_FACETS").MustString(strings.TrimRight(AppURL, "/")))
U2F.AppID = sec.Key("APP_ID").MustString(strings.TrimRight(AppURL, "/"))
zip.Verbose = false
}
func loadInternalToken(sec *ini.Section) string {