summaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2014-09-12 21:36:26 -0400
committerUnknwon <joe2010xtmf@163.com>2014-09-12 21:36:26 -0400
commita2cac952a411ab1d1159bdaaf144fbb39a355010 (patch)
treeaa9b8f32d80b1f5df1744865b61c87b8e0bebfe9 /routers
parentbba401a5dcf8af2fdc4c7c05b11db100019ee4fa (diff)
downloadgitea-a2cac952a411ab1d1159bdaaf144fbb39a355010.tar.gz
gitea-a2cac952a411ab1d1159bdaaf144fbb39a355010.zip
Prepare 0.5 release
Diffstat (limited to 'routers')
-rw-r--r--routers/org/teams.go4
-rw-r--r--routers/repo/setting.go2
2 files changed, 3 insertions, 3 deletions
diff --git a/routers/org/teams.go b/routers/org/teams.go
index b0a69da76e..9aa8e50214 100644
--- a/routers/org/teams.go
+++ b/routers/org/teams.go
@@ -94,7 +94,7 @@ func TeamsAction(ctx *middleware.Context) {
if err == models.ErrLastOrgOwner {
ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
} else {
- log.Error(4, "Action(%s): %v", ctx.Params(":action"), err)
+ log.Error(3, "Action(%s): %v", ctx.Params(":action"), err)
ctx.JSON(200, map[string]interface{}{
"ok": false,
"err": err.Error(),
@@ -133,7 +133,7 @@ func TeamsRepoAction(ctx *middleware.Context) {
}
if err != nil {
- log.Error(4, "Action(%s): %v", ctx.Params(":action"), err)
+ log.Error(3, "Action(%s): %v", ctx.Params(":action"), err)
ctx.JSON(200, map[string]interface{}{
"ok": false,
"err": err.Error(),
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index 2354fbc13f..b30de91a3a 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -213,7 +213,7 @@ func SettingsCollaboration(ctx *middleware.Context) {
needDelete := true
if ctx.User.IsOrganization() {
// Check if user belongs to a team that has access to this repository.
- auth, err := models.GetHighestAuthorize(ctx.Repo.Owner.Id, ctx.User.Id, 0, ctx.Repo.Repository.Id)
+ auth, err := models.GetHighestAuthorize(ctx.Repo.Owner.Id, ctx.User.Id, ctx.Repo.Repository.Id, 0)
if err != nil {
ctx.Handle(500, "GetHighestAuthorize", err)
return