From 5d9ef2bb12d2dee4c3b27429184a81004ac2fe87 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 17 Nov 2014 16:25:39 -0500 Subject: [PATCH] lock gopmfile --- .gopmfile | 20 ++++++++++---------- README.md | 2 +- README_ZH.md | 2 +- models/publickey.go | 2 +- public/ng/css/gogs.css | 1 + public/ng/less/gogs/repository.less | 1 + 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.gopmfile b/.gopmfile index f78fe1656..a350578d6 100644 --- a/.gopmfile +++ b/.gopmfile @@ -7,21 +7,21 @@ github.com/beego/redigo = commit:856744a0d5 github.com/Unknwon/cae = commit:2e70a1351b github.com/Unknwon/com = commit:2cbcbc6916 github.com/Unknwon/goconfig = commit:0f8d8dc1c0 -github.com/Unknwon/i18n = -github.com/Unknwon/macaron = +github.com/Unknwon/i18n = commit:aec5f77857 +github.com/Unknwon/macaron = commit:5c8d1b7642 github.com/codegangsta/cli = commit:7381bc4e62 github.com/go-sql-driver/mysql = commit:8111ee3ec3 -github.com/go-xorm/core = -github.com/go-xorm/xorm = -github.com/gogits/go-gogs-client = +github.com/go-xorm/core = commit:3e0fa232ab +github.com/go-xorm/xorm = commit:58d33844ce +github.com/gogits/go-gogs-client = commit:a5c3262f5e github.com/gogits/oauth2 = commit:99cbec870a github.com/lib/pq = commit:b021d0ef20 -github.com/macaron-contrib/binding = -github.com/macaron-contrib/cache = -github.com/macaron-contrib/captcha = -github.com/macaron-contrib/csrf = +github.com/macaron-contrib/binding = commit:0e23661e7d +github.com/macaron-contrib/cache = commit:0bb9e6c9ef +github.com/macaron-contrib/captcha = commit:3567dc48b8 +github.com/macaron-contrib/csrf = commit:422b79675c github.com/macaron-contrib/i18n = commit:2246f45894 -github.com/macaron-contrib/session = +github.com/macaron-contrib/session = commit:f00d48fd4f github.com/macaron-contrib/toolbox = commit:57127bcc89 github.com/mattn/go-sqlite3 = commit:a80c27ba33 github.com/nfnt/resize = commit:581d15cb53 diff --git a/README.md b/README.md index 8a5a71e3d..a33286bb4 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Gogs(Go Git Service) is a painless self-hosted Git Service written in Go. ![Demo](https://gowalker.org/public/gogs_demo.gif) -##### Current version: 0.5.7 Beta +##### Current version: 0.5.8 Beta ### NOTICES diff --git a/README_ZH.md b/README_ZH.md index cb5e5a1a6..cb1af2f42 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -5,7 +5,7 @@ Gogs(Go Git Service) 是一个基于 Go 语言的自助 Git 服务。 ![Demo](https://gowalker.org/public/gogs_demo.gif) -##### 当前版本：0.5.7 Beta +##### 当前版本：0.5.8 Beta ## 开发目的 diff --git a/models/publickey.go b/models/publickey.go index f379e1218..5a488c2af 100644 --- a/models/publickey.go +++ b/models/publickey.go @@ -81,7 +81,7 @@ type PublicKey struct { Id int64 OwnerId int64 `xorm:"UNIQUE(s) INDEX NOT NULL"` Name string `xorm:"UNIQUE(s) NOT NULL"` - Fingerprint string `xorm:"INDEX NOT NULL"` + Fingerprint string `xorm:"UNIQUE NOT NULL"` Content string `xorm:"TEXT NOT NULL"` Created time.Time `xorm:"CREATED"` Updated time.Time diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css index 14acd7a91..961ad6a86 100644 --- a/public/ng/css/gogs.css +++ b/public/ng/css/gogs.css @@ -1427,6 +1427,7 @@ The register and sign-in page style } .code-view .lines-code > pre > ol.linenums > li { padding: 0 10px; + line-height: 20px; } .code-view .lines-code > pre > ol.linenums > li.active { background: #ffffdd; diff --git a/public/ng/less/gogs/repository.less b/public/ng/less/gogs/repository.less index d0e4a3ce3..45387fecd 100644 --- a/public/ng/less/gogs/repository.less +++ b/public/ng/less/gogs/repository.less @@ -458,6 +458,7 @@ border-left: 1px solid #ddd; > ol.linenums > li { padding: 0 10px; + line-height: 20px; &.active { background: #ffffdd; }