Mirror fix

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1b71d5313641ab3d381c202e98cbebef93bd259d..17a3ebe68ffddf2041ea5ae0257df07d7bd414ac 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,6 +2,8 @@
 
 > Thanks [drone](https://github.com/drone/drone) because this guidelines sheet is forked from its [CONTRIBUTING.md](https://github.com/drone/drone/blob/master/CONTRIBUTING.md).
 
+**This document is pre^3 release, we're not ready for receiving contribution until v0.5.0 release.**
+
 Want to hack on Gogs? Awesome! Here are instructions to get you started. They are probably not perfect, please let us know if anything feels wrong or incomplete.
 
 ## Contribution guidelines

diff --git a/README.md b/README.md
index 42eba6362da498d06111888258f7456b55096ee5..104b7eab55290594ac272712bcc7be000d513cf7 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0bc450ac6f09bc56b9640a50aa/s/ "wercker status")](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [![Build Status](https://drone.io/github.com/gogits/gogs/status.png)](https://drone.io/github.com/gogits/gogs/latest) [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/gogits/gogs/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0bc450ac6f09bc56b9640a50aa/s/ "wercker status")](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [![Build Status](https://drone.io/github.com/gogits/gogs/status.png)](https://drone.io/github.com/gogits/gogs/latest)
 =====================
 
 Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language.
@@ -48,9 +48,11 @@ There are two ways to install Gogs:
 
 ## Acknowledgments
 
-- Logo is inspired by [martini](https://github.com/martini-contrib).
+- Logo is inspired by [martini-contrib](https://github.com/martini-contrib).
+- Router and middleware mechanism of [martini](http://martini.codegangsta.io/).
 - Mail Service, modules design is inspired by [WeTalk](https://github.com/beego/wetalk).
 - System Monitor Status is inspired by [GoBlog](https://github.com/fuxiaohei/goblog).
+- Usage and modification from [beego](http://beego.me) modules.
 
 ## Contributors
 

diff --git a/README_ZH.md b/README_ZH.md
index b405e04198c86e619ad2bd245fd0a3bcdad08aee..838e30a0ef9416f9456fc4afcfd06fbe7f79fac7 100644 (file)
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -1,4 +1,4 @@
-Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0bc450ac6f09bc56b9640a50aa/s/ "wercker status")](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [![Build Status](https://drone.io/github.com/gogits/gogs/status.png)](https://drone.io/github.com/gogits/gogs/latest) [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/gogits/gogs/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0bc450ac6f09bc56b9640a50aa/s/ "wercker status")](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [![Build Status](https://drone.io/github.com/gogits/gogs/status.png)](https://drone.io/github.com/gogits/gogs/latest)
 =====================
 
 Gogs(Go Git Service) 是一个由 Go 语言编写的自助 Git 托管服务。
@@ -44,9 +44,11 @@ Gogs 完全使用 Go 语言来实现对 Git 数据的操作，实现 **零** 依
 
 ## 特别鸣谢
 
-- Logo 基于 [martini](https://github.com/martini-contrib) 修改而来。
-- 邮件服务、模块设计基于 [WeTalk](https://github.com/beego/wetalk) 修改而来。
-- 系统监视状态基于 [GoBlog](https://github.com/fuxiaohei/goblog) 修改而来。
+- Logo 基于 [martini-contrib](https://github.com/martini-contrib) 修改而来。
+- 基于 [WeTalk](https://github.com/beego/wetalk) 修改的邮件服务和模块设计。
+- 基于 [GoBlog](https://github.com/fuxiaohei/goblog) 修改的系统监视状态。
+- [beego](http://beego.me) 模块的使用与修改。
+- [martini](http://martini.codegangsta.io/) 的路由与中间件机制。
 
 ## 贡献成员
 

diff --git a/gogs.go b/gogs.go
index 09b28f9b3f7f8f2c67d92cecc450aa2091b3b130..93b7231b77b622b4cc5f016e73d06efbf5fef111 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -20,7 +20,7 @@ import (
 // Test that go1.2 tag above is included in builds. main.go refers to this definition.
 const go12tag = true
 
-const APP_VER = "0.1.7.0323.1"
+const APP_VER = "0.1.7.0324"
 
 func init() {
        base.AppVer = APP_VER

diff --git a/models/repo.go b/models/repo.go
index e27e99b056eb0e5f775c4de9dc3598702ce82c75..f03d7683ddad3d529ea61d4bc9afb8086c6295b1 100644 (file)
--- a/models/repo.go
+++ b/models/repo.go
@@ -387,7 +387,7 @@ func UpdateRepository(repo *Repository) error {
                repo.Website = repo.Website[:255]
        }
 
-       _, err := orm.Id(repo.Id).UseBool().Cols("description", "website").Update(repo)
+       _, err := orm.Id(repo.Id).UseBool().Cols("description", "website", "updated").Update(repo)
        return err
 }
 

diff --git a/models/user.go b/models/user.go
index 7fd7449ce500784af065d25c7b0b9c1df0068e2d..d2ed5a907dcb69c9a3660f001fe8f770a84d90f1 100644 (file)
--- a/models/user.go
+++ b/models/user.go
@@ -211,7 +211,7 @@ func UpdateUser(user *User) (err error) {
                user.Website = user.Website[:255]
        }
 
-       _, err = orm.Id(user.Id).UseBool().Cols("website", "location", "is_active", "is_admin").Update(user)
+       _, err = orm.Id(user.Id).UseBool().Cols("email", "passwd", "avatar", "avatar_email", "website", "location", "is_active", "is_admin", "updated").Update(user)
        return err
 }
 

diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index d4a12a4a83a9e6ed76402ab36087d0df1fce4904..16c60389da582f862b1097a60017015565e0dbb1 100644 (file)
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -6,6 +6,7 @@ package repo
 
 import (
        "github.com/codegangsta/martini"
+
        "github.com/gogits/gogs/modules/middleware"
 )
 

diff --git a/web.go b/web.go
index 4236d8b31ac3c9be2c1cfd374b1f16fb1fc6a92b..f0f811257938366b73902cc30b6247aed90e6f1f 100644 (file)
--- a/web.go
+++ b/web.go
@@ -31,9 +31,10 @@ import (
 
 var CmdWeb = cli.Command{
        Name:  "web",
-       Usage: "just run",
+       Usage: "Gogs web server",
        Description: `
-gogs web`,
+gogs web server is the only thing you need to run, 
+and it takes care of all the other things for you`,
        Action: runWeb,
        Flags:  []cli.Flag{},
 }