diff --git a/.gopmfile b/.gopmfile index 30618dfb0..e28b41d42 100644 --- a/.gopmfile +++ b/.gopmfile @@ -3,7 +3,7 @@ path = github.com/gogits/gogs [deps] github.com/bradfitz/gomemcache = commit:72a68649ba -github.com/codegangsta/cli = commit:0302d39 +github.com/codegangsta/cli = commit:b5232bb github.com/go-macaron/binding = commit:2502aaf github.com/go-macaron/cache = commit:5617353 github.com/go-macaron/captcha = commit:8aa5919 @@ -17,12 +17,12 @@ github.com/go-sql-driver/mysql = commit:d512f20 github.com/go-xorm/core = commit:acb6f00 github.com/go-xorm/xorm = commit:a8fba4d github.com/gogits/chardet = commit:2404f77725 -github.com/gogits/git-shell = +github.com/gogits/git-shell = commit:1ffc4bc github.com/gogits/go-gogs-client = commit:4b541fa github.com/issue9/identicon = commit:f8c0d2c -github.com/kardianos/minwinsvc = -github.com/klauspost/compress = commit:bcd0709 -github.com/klauspost/cpuid = commit:8d9fe96 +github.com/kardianos/minwinsvc = commit:cad6b2b +github.com/klauspost/compress = commit:42eb574 +github.com/klauspost/cpuid = commit:eebb3ea github.com/klauspost/crc32 = commit:0aff1ea github.com/lib/pq = commit:11fc39a github.com/mattn/go-sqlite3 = commit:5651a9d @@ -30,19 +30,19 @@ github.com/mcuadros/go-version = commit:d52711f github.com/microcosm-cc/bluemonday = commit:4ac6f27 github.com/msteinert/pam = commit:02ccfbf github.com/nfnt/resize = commit:dc93e1b98c -github.com/russross/blackfriday = commit:300106c +github.com/russross/blackfriday = commit:d18b67a github.com/shurcooL/sanitized_anchor_name = commit:10ef21a github.com/Unknwon/cae = commit:7f5e046 github.com/Unknwon/com = commit:28b053d github.com/Unknwon/i18n = commit:3b48b66 github.com/Unknwon/paginater = commit:7748a72 -golang.org/x/net = -golang.org/x/text = -golang.org/x/crypto = +golang.org/x/net = commit:d75b190 +golang.org/x/text = commit:458f474 +golang.org/x/crypto = commit:7b85b09 gopkg.in/asn1-ber.v1 = commit:4e86f43 -gopkg.in/gomail.v2 = commit:df6fc79 -gopkg.in/ini.v1 = commit:65f8c74 -gopkg.in/ldap.v2 = e9a325d +gopkg.in/gomail.v2 = commit:fbb71dd +gopkg.in/ini.v1 = commit:a4e5487 +gopkg.in/ldap.v2 = commit:e9a325d gopkg.in/macaron.v1 = commit:1c6dd87 gopkg.in/redis.v2 = commit:e617904962 diff --git a/README.md b/README.md index b03dd1646..ef23ff318 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 version: 0.7.44 +##### Current version: 0.8.0 | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/docker/build.sh b/docker/build.sh index 2e59616da..4249b1d12 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -13,8 +13,8 @@ apk -U --no-progress add linux-pam-dev go@community gcc musl-dev mkdir -p ${GOPATH}/src/github.com/gogits/ ln -s /app/gogs/ ${GOPATH}/src/github.com/gogits/gogs cd ${GOPATH}/src/github.com/gogits/gogs -go get -v -tags "sqlite redis memcache cert pam" -go build -tags "sqlite redis memcache cert pam" +go get -v -tags "sqlite cert pam" +go build -tags "sqlite cert pam" # Cleanup GOPATH rm -r $GOPATH diff --git a/gogs.go b/gogs.go index 5dfad6fed..7704ed777 100644 --- a/gogs.go +++ b/gogs.go @@ -18,7 +18,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.7.44.1212" +const APP_VER = "0.8.0.1212" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/public/css/gogs.css b/public/css/gogs.css index b4e50eda7..8ca17151f 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -896,10 +896,10 @@ pre.raw { border-color: #F0C36D; } .ui .info.segment { - border-color: #85c5e5; + border: 1px solid #c5d5dd; } .ui .info.segment.top { - background-color: #d9edf7 !important; + background-color: #e6f1f6 !important; } .ui .info.segment.top h3, .ui .info.segment.top h4 { @@ -2310,7 +2310,8 @@ footer .container .links > *:first-child { color: #888; } .repository .diff-file-box .header { - border-bottom: 1px solid #d4d4d5!important; + border-bottom: 1px solid #d8d8d8; + background-color: #f7f7f7; } .repository .diff-file-box .file-body.file-code .lines-num { text-align: right; diff --git a/public/less/_base.less b/public/less/_base.less index 671c70887..ab2785ff5 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -197,9 +197,9 @@ pre { } .info { &.segment { - border-color: #85c5e5; + border: 1px solid #c5d5dd; &.top { - background-color: #d9edf7 !important; + background-color: #e6f1f6 !important; h3, h4 { margin-top: 0; } diff --git a/public/less/_repository.less b/public/less/_repository.less index e13d04195..7f12f05de 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -661,7 +661,7 @@ } .diff-file-box { .header { - border-bottom: 1px solid #d4d4d5!important; + background-color: #f7f7f7; } .file-body.file-code { .lines-num { diff --git a/templates/.VERSION b/templates/.VERSION index d91ea27ad..ec9d7eef9 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.7.44.1212 \ No newline at end of file +0.8.0.1212 \ No newline at end of file diff --git a/templates/repo/diff_box.tmpl b/templates/repo/diff_box.tmpl index c0b106aff..036d4a649 100644 --- a/templates/repo/diff_box.tmpl +++ b/templates/repo/diff_box.tmpl @@ -6,7 +6,7 @@ {{.i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}}
- {{.i18n.Tr "repo.diff.show_diff_stats"}} + {{.i18n.Tr "repo.diff.show_diff_stats"}}