Prepare 0.5 release

diff --git a/.gopmfile b/.gopmfile
index 6aac4953ff6d2fed0d451dfc63721bff5a9bc356..6edec7769053a55d6248cc1b48aa4a25e91a4cf1 100644 (file)
--- a/.gopmfile
+++ b/.gopmfile
@@ -2,30 +2,29 @@
 path = github.com/gogits/gogs
 
 [deps]
-github.com/beego/memcache = 
-github.com/beego/redigo = 
-github.com/Unknwon/cae = 
-github.com/Unknwon/com = 
-github.com/Unknwon/goconfig = 
-github.com/Unknwon/i18n = 
-github.com/Unknwon/macaron = 
-github.com/codegangsta/cli = 
-github.com/go-sql-driver/mysql = 
-github.com/go-xorm/core = 
-github.com/go-xorm/xorm = 
-github.com/gogits/gfm = 
-github.com/gogits/git = 
-github.com/gogits/oauth2 = 
-github.com/lib/pq = 
-github.com/macaron-contrib/cache = 
-github.com/macaron-contrib/captcha = 
-github.com/macaron-contrib/csrf = 
-github.com/macaron-contrib/i18n = 
-github.com/macaron-contrib/session = 
-github.com/macaron-contrib/toolbox = 
-github.com/mattn/go-sqlite3 = 
-github.com/nfnt/resize = 
-github.com/saintfish/chardet = 
+github.com/beego/memcache = commit:2aea774416
+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 = commit:47baeff8d0
+github.com/Unknwon/macaron = commit:f22f45d79a
+github.com/codegangsta/cli = commit:7381bc4e62
+github.com/go-sql-driver/mysql = commit:8111ee3ec3
+github.com/go-xorm/core = commit:750aae0fa5
+github.com/go-xorm/xorm = commit:2d8b3135b1
+github.com/gogits/gfm = commit:40f747a9c0
+github.com/gogits/oauth2 = commit:99cbec870a
+github.com/lib/pq = commit:b021d0ef20
+github.com/macaron-contrib/cache = commit:204d8e5137
+github.com/macaron-contrib/captcha = commit:8f3f1ac0e3
+github.com/macaron-contrib/csrf = commit:cd84c01723
+github.com/macaron-contrib/i18n = commit:489cc194b5
+github.com/macaron-contrib/session = commit:80a88a1bba
+github.com/macaron-contrib/toolbox = commit:57127bcc89
+github.com/mattn/go-sqlite3 = commit:a80c27ba33
+github.com/nfnt/resize = commit:581d15cb53
+github.com/saintfish/chardet = commit:3af4cd4741
 
 [res]
 include = conf|etc|public|scripts|templates

diff --git a/README.md b/README.md
index 3115d3fc64a6d4b57f77a0f366ac3e346ac8a5b7..057711445260f802c7085fe1a8804971c9286692 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0b
 
 Gogs(Go Git Service) is a painless self-hosted Git Service written in Go.
 
-![Demo](http://gowalker.org/public/gogs_demo.gif)
+![Demo](https://gowalker.org/public/gogs_demo.gif)
 
 ##### Current version: 0.5.0 Beta
 

diff --git a/README_ZH.md b/README_ZH.md
index ef154d0e654e32b3270d1c55890a4398501ee608..2fa82e7d273d6f084f907fe27a4d1df6b5795176 100644 (file)
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0b
 
 Gogs(Go Git Service) 是一个基于 Go 语言的自助 Git 服务。
 
-![Demo](http://gowalker.org/public/gogs_demo.gif)
+![Demo](https://gowalker.org/public/gogs_demo.gif)
 
 ##### 当前版本：0.5.0 Beta
 

diff --git a/models/git_diff.go b/models/git_diff.go
index 21a624de5fbfcd8e273dbf121820f6572a007684..bf7a9cd575b145b0c87809ca809ce8de48c22e13 100644 (file)
--- a/models/git_diff.go
+++ b/models/git_diff.go
@@ -15,8 +15,7 @@ import (
 
        "github.com/Unknwon/com"
 
-       "github.com/gogits/git"
-
+       "github.com/gogits/gogs/modules/git"
        "github.com/gogits/gogs/modules/log"
        "github.com/gogits/gogs/modules/process"
 )

diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index ee364905dfac430077a80a0d6acaaa2924509708..5dd35acc51406c76596bcfb0d2f82ea1d4667c33 100644 (file)
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -1316,6 +1316,7 @@ The register and sign-in page style
   padding: 0;
 }
 .code-view .lines-num {
+  vertical-align: top;
   text-align: right;
   color: #999;
   background: #f5f5f5;

diff --git a/public/ng/less/gogs/repository.less b/public/ng/less/gogs/repository.less
index 955a617cc466893367ce80e8f5bfdd560dc3de6c..48959a627f765bbaf30ecec25cc7338ae97485c3 100644 (file)
--- a/public/ng/less/gogs/repository.less
+++ b/public/ng/less/gogs/repository.less
@@ -399,6 +399,7 @@ border-top-right-radius: .25em;
                }
        }
        .lines-num {
+               vertical-align: top;
                text-align: right;
                color: #999;
                background: #f5f5f5;