diff options
| author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-02-22 09:05:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-22 09:05:26 +0800 |
| commit | 648d9e253c1924b832248f26fee42b2fb64dc3bc (patch) | |
| tree | 51649fad974cd7284a47d30e412c90e7ab72cd2c /internal/db/git_diff.go | |
| parent | 5b14cc6f0b7b661beb2640a94bd15660cdb48587 (diff) | |
conf: overhaul server settings (#5928)
* conf: rename package
* Requires Go 1.12
* Fix lint
* Fix lint
* Overhaul
* db: fix tests
* Save my work
* Fix tests
* Server.UnixSocketPermission
* Server.LocalRootURL
* SSH settings
* Server.OfflineMode
* Save my work
* App.Version
* Remove [server] STATIC_ROOT_PATH
* Server.LandingURL
Diffstat (limited to 'internal/db/git_diff.go')
| -rw-r--r-- | internal/db/git_diff.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/db/git_diff.go b/internal/db/git_diff.go index 040c472b..a8b43554 100644 --- a/internal/db/git_diff.go +++ b/internal/db/git_diff.go @@ -17,7 +17,7 @@ import ( "github.com/gogs/git-module" - "gogs.io/gogs/internal/setting" + "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/template/highlight" "gogs.io/gogs/internal/tool" ) @@ -69,7 +69,7 @@ func init() { // ComputedInlineDiffFor computes inline diff for the given line. func (diffSection *DiffSection) ComputedInlineDiffFor(diffLine *git.DiffLine) template.HTML { - if setting.Git.DisableDiffHighlight { + if conf.Git.DisableDiffHighlight { return template.HTML(html.EscapeString(diffLine.Content[1:])) } var ( |