diff --git a/README.md b/README.md index bbae77cd8d..ef5df9936d 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.8.50 +##### Current version: 0.8.51 | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS index fc96eeb522..cae620dbde 100644 --- a/conf/locale/TRANSLATORS +++ b/conf/locale/TRANSLATORS @@ -19,6 +19,7 @@ Cysioland Daniel Speichert David Yzaguirre Dmitriy Nogay +Enrico Testori hypertesto AT gmail DOT com Ezequiel Gonzalez Rial Gregor Santner Hamid Feizabadi @@ -33,15 +34,18 @@ Lauri Ojansivu Luc Stepniewski Luca Kröger Marc Schiller +Marvin Menzerath Miguel de la Cruz Mikhail Burdin Morten Sørensen Nakao Takamasa Natan Albuquerque Odilon Junior +SeongJae Park Thomas Fanninger Tilmann Bach Toni Villena Jiménez +Vladimir Jigulin mogaika AT yandex DOT ru Vladimir Vissoultchev YJSoft Łukasz Jan Niemier diff --git a/gogs.go b/gogs.go index c57dd2bdd2..6f06c795ad 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.8.50.0301" +const APP_VER = "0.8.51.0303" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/org.go b/models/org.go index f70d182c7b..680518c163 100644 --- a/models/org.go +++ b/models/org.go @@ -1055,8 +1055,7 @@ func RemoveOrgRepo(orgID, repoID int64) error { // that the user with the given userID has access to. func (org *User) GetUserRepositories(userID int64) (err error) { teams := make([]*Team, 0, 10) - if err = x.Cols("`team`.id"). - Where("`team_user`.org_id=?", org.Id). + if err = x.Where("`team_user`.org_id=?", org.Id). And("`team_user`.uid=?", userID). Join("INNER", "`team_user`", "`team_user`.team_id=`team`.id"). Find(&teams); err != nil { @@ -1076,8 +1075,7 @@ func (org *User) GetUserRepositories(userID int64) (err error) { // As a workaround, we have to build the IN statement on our own, until this is fixed. // https://github.com/go-xorm/xorm/issues/342 - if err = x.Cols("`repository`.*"). - Join("INNER", "`team_repo`", "`team_repo`.repo_id=`repository`.id"). + if err = x.Join("INNER", "`team_repo`", "`team_repo`.repo_id=`repository`.id"). Where("`repository`.owner_id=?", org.Id). And("`repository`.is_private=?", false). Or("`team_repo`.team_id IN (?)", strings.Join(teamIDs, ",")). diff --git a/templates/.VERSION b/templates/.VERSION index 7052ac3fdc..fa72d66699 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.8.50.0301 \ No newline at end of file +0.8.51.0303 \ No newline at end of file