Skip to content
Permalink
Browse files

Feat/dep update (matcornic#28)

* feat: dep update

* fix: download dep as a binary
  • Loading branch information...
matcornic committed Dec 12, 2017
1 parent 3d5f83d commit 97e4381206e810677b08ddf54c778d84ae4ebf6e
Showing with 28 additions and 24 deletions.
  1. +2 −4 .travis.yml
  2. +20 −14 Gopkg.lock
  3. +3 −3 Gopkg.toml
  4. +1 −1 examples/default/default.maintenance.txt
  5. +1 −1 examples/flat/flat.maintenance.txt
  6. +1 −1 hermes.go
@@ -7,10 +7,8 @@ go:
- 1.9

install:
- wget https://github.com/golang/dep/releases/download/v0.3.0/dep-linux-amd64.zip
- unzip dep-linux-amd64.zip
- chmod +x dep
- ./dep ensure
- curl -L https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 -o dep
- chmod u+x dep && ./dep ensure
- go get -u github.com/alecthomas/gometalinter
- gometalinter -u -i -f

Some generated files are not rendered by default. Learn more.

@@ -23,19 +23,19 @@

[[constraint]]
name = "github.com/Masterminds/sprig"
version = "2.12.0"
version = "2.14.1"

[[constraint]]
name = "github.com/imdario/mergo"
version = "0.2.2"
version = "0.2.4"

[[constraint]]
branch = "master"
name = "github.com/jaytaylor/html2text"

[[constraint]]
name = "github.com/russross/blackfriday"
branch = "master"
version = "2.0.0"

[[constraint]]
name = "github.com/stretchr/testify"
@@ -20,7 +20,7 @@ Services will be unavailable based on the following schedule:
| Service C | 5AM to 6AM |
+-----------+------------+

Feel free to contact us for any question regarding this matter at support@hermes-example.com ( support@hermes-example.com ) or in our Gitter ( https://gitter.im/ )
Feel free to contact us for any question regarding this matter at support@hermes-example.com or in our Gitter ( https://gitter.im/ )

Yours truly,
Hermes - https://example-hermes.com/
@@ -20,7 +20,7 @@ Services will be unavailable based on the following schedule:
| Service C | 5AM to 6AM |
+-----------+------------+

Feel free to contact us for any question regarding this matter at support@hermes-example.com ( support@hermes-example.com ) or in our Gitter ( https://gitter.im/ )
Feel free to contact us for any question regarding this matter at support@hermes-example.com or in our Gitter ( https://gitter.im/ )

Yours truly,
Hermes - https://example-hermes.com/
@@ -73,7 +73,7 @@ type Body struct {

// ToHTML converts Markdown to HTML
func (c Markdown) ToHTML() template.HTML {
return template.HTML(blackfriday.MarkdownCommon([]byte(string(c))))
return template.HTML(blackfriday.Run([]byte(string(c))))
}

// Entry is a simple entry of a map

0 comments on commit 97e4381

Please sign in to comment.
You can’t perform that action at this time.