Browse Source

work on #1748

tags/v0.9.99
Unknwon 8 years ago
parent
commit
fad31ca302
4 changed files with 13 additions and 11 deletions
  1. 2
    2
      gogs.go
  2. 8
    6
      models/action.go
  3. 2
    2
      routers/repo/issue.go
  4. 1
    1
      templates/.VERSION

+ 2
- 2
gogs.go View File

@@ -4,7 +4,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.

// Gogs(Go Git Service) is a painless self-hosted Git Service written in Go.
// Gogs (Go Git Service) is a painless self-hosted Git Service.
package main

import (
@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)

const APP_VER = "0.6.18.1031 Beta"
const APP_VER = "0.6.19.1031 Beta"

func init() {
runtime.GOMAXPROCS(runtime.NumCPU())

+ 8
- 6
models/action.go View File

@@ -337,6 +337,14 @@ func CommitRepoAction(
return fmt.Errorf("GetOwner: %v", err)
}

// Change repository bare status and update last updated time.
if repo.IsBare {
repo.IsBare = false
if err = UpdateRepository(repo, false); err != nil {
return fmt.Errorf("UpdateRepository: %v", err)
}
}

isNewBranch := false
opType := COMMIT_REPO
// Check it's tag push or branch.
@@ -351,12 +359,6 @@ func CommitRepoAction(
isNewBranch = true
}

// Change repository bare status and update last updated time.
repo.IsBare = false
if err = UpdateRepository(repo, false); err != nil {
return fmt.Errorf("UpdateRepository: %v", err)
}

if err = updateIssuesCommit(u, repo, repoUserName, repoName, commit.Commits); err != nil {
log.Error(4, "updateIssuesCommit: %v", err)
}

+ 2
- 2
routers/repo/issue.go View File

@@ -781,8 +781,8 @@ func NewComment(ctx *middleware.Context, form auth.CreateCommentForm) {

var comment *models.Comment
defer func() {
// Check if issue owner/poster changes the status of issue.
if (ctx.Repo.IsOwner() || (ctx.IsSigned && issue.IsPoster(ctx.User.Id))) &&
// Check if issue admin/poster changes the status of issue.
if (ctx.Repo.IsAdmin() || (ctx.IsSigned && issue.IsPoster(ctx.User.Id))) &&
(form.Status == "reopen" || form.Status == "close") &&
!(issue.IsPull && issue.HasMerged) {


+ 1
- 1
templates/.VERSION View File

@@ -1 +1 @@
0.6.18.1031 Beta
0.6.19.1031 Beta

Loading…
Cancel
Save