Browse Source

Fix ref comment from commit create empty feed

Unknwon 9 years ago
parent
commit
5267dce210
5 changed files with 9 additions and 6 deletions
  1. 1 1
      README.md
  2. 1 1
      gogs.go
  3. 5 3
      models/issue_comment.go
  4. 1 0
      modules/base/tool.go
  5. 1 1
      templates/.VERSION

+ 1 - 1
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.9.3
+##### Current version: 0.9.4
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|

+ 1 - 1
gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.9.3.0309"
+const APP_VER = "0.9.4.0311"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

+ 5 - 3
models/issue_comment.go

@@ -202,9 +202,11 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err
 		}
 	}
 
-	// Notify watchers for whatever action comes in
-	if err = notifyWatchers(e, act); err != nil {
-		return nil, fmt.Errorf("notifyWatchers: %v", err)
+	// Notify watchers for whatever action comes in, ignore if no action type
+	if act.OpType > 0 {
+		if err = notifyWatchers(e, act); err != nil {
+			return nil, fmt.Errorf("notifyWatchers: %v", err)
+		}
 	}
 
 	return comment, nil

+ 1 - 0
modules/base/tool.go

@@ -97,6 +97,7 @@ func GetRandomString(n int, alphabets ...byte) string {
 }
 
 // http://code.google.com/p/go/source/browse/pbkdf2/pbkdf2.go?repo=crypto
+// FIXME: use https://godoc.org/golang.org/x/crypto/pbkdf2?
 func PBKDF2(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte {
 	prf := hmac.New(h, password)
 	hashLen := prf.Size()

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.9.3.0309
+0.9.4.0311