From 3abc41cccab2486012b46305827433ad6f5deade Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 18 Oct 2014 23:26:55 -0400 Subject: [PATCH] Fix API broken --- README.md | 3 ++- README_ZH.md | 3 ++- cmd/web.go | 2 +- gogs.go | 2 +- modules/middleware/context.go | 2 +- routers/api/v1/miscellaneous.go | 3 +-- routers/install.go | 1 + routers/repo/http.go | 2 +- routers/user/auth.go | 2 +- templates/.VERSION | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index b6dd1ea5fd..f46d712779 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ The goal of this project is to make the easiest, fastest and most painless way t - Slack webhook integration - Supports MySQL, PostgreSQL and SQLite3 - Social account login(GitHub, Google, QQ, Weibo) -- Multi-language support(English, Simplified Chinese, Traditional Chinese, Germany, French, Dutch etc.) +- Multi-language support(English, Simplified Chinese, Traditional Chinese, Germany, French, Dutch, and [more](https://crowdin.com/project/gogs)) ## System Requirements @@ -73,6 +73,7 @@ There are 5 ways to install Gogs: - Usage and modification from [beego](http://beego.me) modules. - Thanks [lavachen](http://www.lavachen.cn/) and [Rocker](http://weibo.com/rocker1989) for designing Logo. - Thanks [gobuild.io](http://gobuild.io) for providing binary compile and download service. +- Thanks to [Crowdin](https://crowdin.com/project/gogs) for providing open source translation plan. ## Contributors diff --git a/README_ZH.md b/README_ZH.md index a8cefa44f9..783c529f6c 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -37,7 +37,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自 - Slack Web 钩子集成 - 支持 MySQL、PostgreSQL 以及 SQLite3 数据库 - 社交帐号登录（GitHub、Google、QQ、微博） -- 多语言支持（英文、简体中文、繁体中文、德语、法语、荷兰语等等） +- 多语言支持（英文、简体中文、繁体中文、德语、法语、荷兰语以及 [更多]([more](https://crowdin.com/project/gogs))） ## 系统要求 @@ -64,6 +64,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自 - 基于 [GoBlog](https://github.com/fuxiaohei/goblog) 修改的系统监视状态。 - 感谢 [gobuild.io](http://gobuild.io) 提供二进制编译与下载服务。 - 感谢 [lavachen](http://www.lavachen.cn/) 和 [Rocker](http://weibo.com/rocker1989) 设计的 Logo。 +- 感谢 [Crowdin](https://crowdin.com/project/gogs) 提供免费的开源项目本地化支持。 ## 贡献成员 diff --git a/cmd/web.go b/cmd/web.go index 98a180a935..ec648af5b4 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -71,7 +71,7 @@ func checkVersion() { log.Fatal(4, "Package i18n version is too old, did you forget to update?(github.com/macaron-contrib/i18n)") } sessionVer := git.MustParseVersion(session.Version()) - if sessionVer.LessThan(git.MustParseVersion("0.0.1")) { + if sessionVer.LessThan(git.MustParseVersion("0.0.3")) { log.Fatal(4, "Package session version is too old, did you forget to update?(github.com/macaron-contrib/session)") } } diff --git a/gogs.go b/gogs.go index 8484de580b..c54abbe594 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.5.5.1015 Beta" +const APP_VER = "0.5.5.1018 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/middleware/context.go b/modules/middleware/context.go index 86e98c9071..c45206a988 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -147,7 +147,7 @@ func (ctx *Context) ServeContent(name string, r io.ReadSeeker, params ...interfa ctx.Resp.Header().Set("Expires", "0") ctx.Resp.Header().Set("Cache-Control", "must-revalidate") ctx.Resp.Header().Set("Pragma", "public") - http.ServeContent(ctx.Resp, ctx.Req, name, modtime, r) + http.ServeContent(ctx.Resp, ctx.Req.Request, name, modtime, r) } // Contexter initializes a classic context for a request. diff --git a/routers/api/v1/miscellaneous.go b/routers/api/v1/miscellaneous.go index 088bcd9c94..f75ae264c2 100644 --- a/routers/api/v1/miscellaneous.go +++ b/routers/api/v1/miscellaneous.go @@ -5,7 +5,6 @@ package v1 import ( - "io/ioutil" "strings" "github.com/gogits/gogs/modules/auth/apiv1" @@ -34,7 +33,7 @@ func Markdown(ctx *middleware.Context, form apiv1.MarkdownForm) { // Render a Markdown document in raw mode. func MarkdownRaw(ctx *middleware.Context) { - body, err := ioutil.ReadAll(ctx.Req.Body) + body, err := ctx.Req.Body().Bytes() if err != nil { ctx.JSON(422, base.ApiJsonErr{err.Error(), DOC_URL}) return diff --git a/routers/install.go b/routers/install.go index 07af613c7e..eff66e84b3 100644 --- a/routers/install.go +++ b/routers/install.go @@ -229,6 +229,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) { setting.Cfg.SetValue("log", "MODE", "file") setting.Cfg.SetValue("security", "INSTALL_LOCK", "true") + setting.Cfg.SetValue("security", "SECRET_KEY", base.GetRandomString(15)) os.MkdirAll("custom/conf", os.ModePerm) if err := goconfig.SaveConfigFile(setting.Cfg, path.Join(setting.CustomPath, "conf/app.ini")); err != nil { diff --git a/routers/repo/http.go b/routers/repo/http.go index 81b49bf309..3641f4dae6 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -204,7 +204,7 @@ func Http(ctx *middleware.Context) { config := Config{setting.RepoRootPath, "git", true, true, f} handler := HttpBackend(&config) - handler(ctx.Resp, ctx.Req) + handler(ctx.Resp, ctx.Req.Request) } type route struct { diff --git a/routers/user/auth.go b/routers/user/auth.go index c695f929a7..dd637786c4 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -229,7 +229,7 @@ func SignUpPost(ctx *middleware.Context, cpt *captcha.Captcha, form auth.Registe return } - if !cpt.VerifyReq(ctx.Req) { + if !cpt.VerifyReq(ctx.Req.Request) { ctx.Data["Err_Captcha"] = true ctx.RenderWithErr(ctx.Tr("form.captcha_incorrect"), SIGNUP, &form) return diff --git a/templates/.VERSION b/templates/.VERSION index 298b4be8e6..38133b40a6 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.5.1015 Beta \ No newline at end of file +0.5.5.1018 Beta \ No newline at end of file