Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade images in .drone.yml to more recent versions (#4819)

This commit is contained in:
techknowlogick 2018-08-29 09:43:58 -04:00 committed by GitHub
parent 179123de35
commit 080428b2bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.drone.yml
View File

@ -22,7 +22,7 @@ pipeline:
branch: [ master ] branch: [ master ]
update-translations: update-translations:
image: alpine:3.6 image: alpine:3.7
commands: commands:
- mv ./options/locale/locale_en-US.ini ./options/ - mv ./options/locale/locale_en-US.ini ./options/
- sed -i -e 's/="/=/g' -e 's/"$$//g' ./options/locale/*.ini - sed -i -e 's/="/=/g' -e 's/"$$//g' ./options/locale/*.ini
@ -64,7 +64,7 @@ pipeline:
event: [ push, tag, pull_request ] event: [ push, tag, pull_request ]
build: build:
image: golang:1.10 image: golang:1.11
pull: true pull: true
environment: environment:
TAGS: bindata sqlite TAGS: bindata sqlite
@ -83,7 +83,7 @@ pipeline:
event: [ push, tag, pull_request ] event: [ push, tag, pull_request ]
test: test:
image: golang:1.10 image: golang:1.11
pull: true pull: true
group: test group: test
environment: environment:
@ -95,7 +95,7 @@ pipeline:
branch: [ master ] branch: [ master ]
test: test:
image: golang:1.10 image: golang:1.11
pull: true pull: true
group: test group: test
environment: environment:
@ -107,7 +107,7 @@ pipeline:
branch: [ release/* ] branch: [ release/* ]
test: test:
image: golang:1.10 image: golang:1.11
pull: true pull: true
group: test group: test
environment: environment:
@ -130,7 +130,7 @@ pipeline:
# event: [ push, tag, pull_request ] # event: [ push, tag, pull_request ]
test-mysql: test-mysql:
image: golang:1.10 image: golang:1.11
pull: true pull: true
group: test group: test
environment: environment:
@ -145,7 +145,7 @@ pipeline:
branch: [ master ] branch: [ master ]
test-mysql: test-mysql:
image: golang:1.10 image: golang:1.11
pull: true pull: true
group: test group: test
environment: environment:
@ -159,7 +159,7 @@ pipeline:
event: [ tag ] event: [ tag ]
test-pgsql: test-pgsql:
image: golang:1.10 image: golang:1.11
pull: true pull: true
group: test group: test
environment: environment:
@ -173,7 +173,7 @@ pipeline:
event: [ push, tag, pull_request ] event: [ push, tag, pull_request ]
generate-coverage: generate-coverage:
image: golang:1.10 image: golang:1.11
pull: true pull: true
environment: environment:
TAGS: bindata TAGS: bindata

8
modules/markup/html.go
View File

@ -191,10 +191,10 @@ func PostProcess(
) ([]byte, error) { ) ([]byte, error) {
// create the context from the parameters // create the context from the parameters
ctx := &postProcessCtx{ ctx := &postProcessCtx{
metas: metas, metas: metas,
urlPrefix: urlPrefix, urlPrefix: urlPrefix,
isWikiMarkdown: isWikiMarkdown, isWikiMarkdown: isWikiMarkdown,
procs: defaultProcessors, procs: defaultProcessors,
visitLinksForShortLinks: true, visitLinksForShortLinks: true,
} }
return ctx.postProcess(rawHTML) return ctx.postProcess(rawHTML)

12
modules/templates/helper.go
View File

@ -103,12 +103,12 @@ func NewFuncMap() []template.FuncMap {
} }
return str[start:end] return str[start:end]
}, },
"EllipsisString": base.EllipsisString, "EllipsisString": base.EllipsisString,
"DiffTypeToStr": DiffTypeToStr, "DiffTypeToStr": DiffTypeToStr,
"DiffLineTypeToStr": DiffLineTypeToStr, "DiffLineTypeToStr": DiffLineTypeToStr,
"Sha1": Sha1, "Sha1": Sha1,
"ShortSha": base.ShortSha, "ShortSha": base.ShortSha,
"MD5": base.EncodeMD5, "MD5": base.EncodeMD5,
"ActionContent2Commits": ActionContent2Commits, "ActionContent2Commits": ActionContent2Commits,
"PathEscape": url.PathEscape, "PathEscape": url.PathEscape,
"EscapePound": func(str string) string { "EscapePound": func(str string) string {