From 95065de39aa6aaffb0ccf4510b74ec0858e9c758 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 19 Nov 2016 21:55:21 -0500 Subject: [PATCH] Fork go-libravatar to remove import path check To use GitHub import path as much as possible. --- .gopmfile | 2 +- README.md | 2 +- glide.lock | 4 ++-- gogs.go | 2 +- modules/setting/setting.go | 3 ++- templates/.VERSION | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gopmfile b/.gopmfile index 0b1b7cc52..856cbbf72 100644 --- a/.gopmfile +++ b/.gopmfile @@ -20,6 +20,7 @@ github.com/gogits/chardet = commit:2404f77 github.com/gogits/cron = commit:7f3990a github.com/gogits/git-module = commit:5e0c133 github.com/gogits/go-gogs-client = commit:c52f7ee +github.com/gogits/go-libravatar = commit:cd1abbd github.com/issue9/identicon = commit:d36b545 github.com/jaytaylor/html2text = commit:52d9b78 github.com/kardianos/minwinsvc = commit:cad6b2b @@ -35,7 +36,6 @@ github.com/nfnt/resize = commit:891127d github.com/russross/blackfriday = commit:93622da github.com/satori/go.uuid = commit:0aa62d5 github.com/sergi/go-diff = commit:ec7fdbb -github.com/strk/go-libravatar = commit:5eed7bf github.com/shurcooL/sanitized_anchor_name = commit:10ef21a github.com/Unknwon/cae = commit:7f5e046 github.com/Unknwon/com = commit:28b053d diff --git a/README.md b/README.md index f3c609688..8e10c59af 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) -##### Current tip version: 0.9.99 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions or submit a task on [alpha stage automated binary building system](https://build.gogs.io/)) +##### Current tip version: 0.9.100 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions or submit a task on [alpha stage automated binary building system](https://build.gogs.io/)) | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/glide.lock b/glide.lock index 0d280df27..d34bd5aeb 100644 --- a/glide.lock +++ b/glide.lock @@ -44,6 +44,8 @@ imports: version: 5e0c1330d7853d1affbc193885d517db0f8d1ca5 - name: github.com/gogits/go-gogs-client version: c52f7ee0cc58d3cd6e379025552873a8df6de322 +- name: github.com/gogits/go-libravatar + version: cd1abbd55d09b793672732a7a1dfdaa12a40dfd0 - name: github.com/issue9/identicon version: d36b54562f4cf70c83653e13dc95c220c79ef521 - name: github.com/jaytaylor/html2text @@ -81,8 +83,6 @@ imports: version: ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7 subpackages: - diffmatchpatch -- name: github.com/strk/go-libravatar - version: 5eed7bff870ae19ef51c5773dbc8f3e9fcbd0982 - name: github.com/shurcooL/sanitized_anchor_name version: 10ef21a441db47d8b13ebcc5fd2310f636973c77 - name: github.com/Unknwon/cae diff --git a/gogs.go b/gogs.go index 05eb66cac..a8e9ea6ad 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.99.1119" +const APP_VER = "0.9.100.1119" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index cff3e7dbc..6a149e81b 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -21,9 +21,10 @@ import ( _ "github.com/go-macaron/cache/redis" "github.com/go-macaron/session" _ "github.com/go-macaron/session/redis" - "github.com/strk/go-libravatar" "gopkg.in/ini.v1" + "github.com/gogits/go-libravatar" + "github.com/gogits/gogs/modules/bindata" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/user" diff --git a/templates/.VERSION b/templates/.VERSION index 9f3e8c15a..022770cc2 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.99.1119 \ No newline at end of file +0.9.100.1119 \ No newline at end of file