From 080428b2bfd6721a40ec6a6bb858cc2d7ad6c583 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@users.noreply.github.com>
Date: Wed, 29 Aug 2018 09:43:58 -0400
Subject: [PATCH] Upgrade images in .drone.yml to more recent versions (#4819)
---
.drone.yml | 18 +++++++++---------
modules/markup/html.go | 8 ++++----
modules/templates/helper.go | 12 ++++++------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.drone.yml b/.drone.yml
index 0caeb1e6756..8986bbf76cb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,7 +22,7 @@ pipeline:
branch: [ master ]
update-translations:
- image: alpine:3.6
+ image: alpine:3.7
commands:
- mv ./options/locale/locale_en-US.ini ./options/
- sed -i -e 's/="/=/g' -e 's/"$$//g' ./options/locale/*.ini
@@ -64,7 +64,7 @@ pipeline:
event: [ push, tag, pull_request ]
build:
- image: golang:1.10
+ image: golang:1.11
pull: true
environment:
TAGS: bindata sqlite
@@ -83,7 +83,7 @@ pipeline:
event: [ push, tag, pull_request ]
test:
- image: golang:1.10
+ image: golang:1.11
pull: true
group: test
environment:
@@ -95,7 +95,7 @@ pipeline:
branch: [ master ]
test:
- image: golang:1.10
+ image: golang:1.11
pull: true
group: test
environment:
@@ -107,7 +107,7 @@ pipeline:
branch: [ release/* ]
test:
- image: golang:1.10
+ image: golang:1.11
pull: true
group: test
environment:
@@ -130,7 +130,7 @@ pipeline:
# event: [ push, tag, pull_request ]
test-mysql:
- image: golang:1.10
+ image: golang:1.11
pull: true
group: test
environment:
@@ -145,7 +145,7 @@ pipeline:
branch: [ master ]
test-mysql:
- image: golang:1.10
+ image: golang:1.11
pull: true
group: test
environment:
@@ -159,7 +159,7 @@ pipeline:
event: [ tag ]
test-pgsql:
- image: golang:1.10
+ image: golang:1.11
pull: true
group: test
environment:
@@ -173,7 +173,7 @@ pipeline:
event: [ push, tag, pull_request ]
generate-coverage:
- image: golang:1.10
+ image: golang:1.11
pull: true
environment:
TAGS: bindata
diff --git a/modules/markup/html.go b/modules/markup/html.go
index a4ef86de227..9040d43e8ca 100644
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -191,10 +191,10 @@ func PostProcess(
) ([]byte, error) {
// create the context from the parameters
ctx := &postProcessCtx{
- metas: metas,
- urlPrefix: urlPrefix,
- isWikiMarkdown: isWikiMarkdown,
- procs: defaultProcessors,
+ metas: metas,
+ urlPrefix: urlPrefix,
+ isWikiMarkdown: isWikiMarkdown,
+ procs: defaultProcessors,
visitLinksForShortLinks: true,
}
return ctx.postProcess(rawHTML)
diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index 7ee68c833e0..c46a293be83 100644
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -103,12 +103,12 @@ func NewFuncMap() []template.FuncMap {
}
return str[start:end]
},
- "EllipsisString": base.EllipsisString,
- "DiffTypeToStr": DiffTypeToStr,
- "DiffLineTypeToStr": DiffLineTypeToStr,
- "Sha1": Sha1,
- "ShortSha": base.ShortSha,
- "MD5": base.EncodeMD5,
+ "EllipsisString": base.EllipsisString,
+ "DiffTypeToStr": DiffTypeToStr,
+ "DiffLineTypeToStr": DiffLineTypeToStr,
+ "Sha1": Sha1,
+ "ShortSha": base.ShortSha,
+ "MD5": base.EncodeMD5,
"ActionContent2Commits": ActionContent2Commits,
"PathEscape": url.PathEscape,
"EscapePound": func(str string) string {