peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
kolaente 2018-01-24 12:02:03 +01:00 committed by GitHub
commit cd734a3b31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/httplib/httplib.go
View File

@ -25,7 +25,7 @@ import (
"time"
)
var defaultSetting = Settings{false, "GogsServer", 60 * time.Second, 60 * time.Second, nil, nil, nil, false}
var defaultSetting = Settings{false, "GiteaServer", 60 * time.Second, 60 * time.Second, nil, nil, nil, false}
var defaultCookieJar http.CookieJar
var settingMutex sync.Mutex

9
modules/search/search.go
View File

@ -6,6 +6,7 @@ package search
import (
"bytes"
"html"
gotemplate "html/template"
"strings"
@ -75,17 +76,17 @@ func searchResult(result *indexer.RepoSearchResult, startIndex, endIndex int) (*
closeActiveIndex := util.Min(result.EndIndex-index, len(line))
err = writeStrings(&formattedLinesBuffer,
`<li>`,
line[:openActiveIndex],
html.EscapeString(line[:openActiveIndex]),
`<span class='active'>`,
line[openActiveIndex:closeActiveIndex],
html.EscapeString(line[openActiveIndex:closeActiveIndex]),
`</span>`,
line[closeActiveIndex:],
html.EscapeString(line[closeActiveIndex:]),
`</li>`,
)
} else {
err = writeStrings(&formattedLinesBuffer,
`<li>`,
line,
html.EscapeString(line),
`</li>`,
)
}