Merge branch 'master' of github.com:gogits/gogs

README.md

@@ -30,7 +30,7 @@ More importantly, Gogs only needs one binary to setup your own project hosting o
 - User profile page.
 - Repository viewer.
 - Gravatar and cache support.
-- Mail service(register).
+- Mail service(register, issue).
 - Administration panel.
 - Supports MySQL, PostgreSQL and SQLite3(binary release only).
 

README_ZH.md

@@ -29,7 +29,7 @@ Gogs 完全使用 Go 语言来实现对 Git 数据的操作，实现 **零** 依
 - 用户个人信息页面
 - 仓库浏览器
 - Gravatar 以及缓存支持
-- 邮件服务（注册）
+- 邮件服务（注册、Issue）
 - 管理员面板
 - 支持 MySQL、PostgreSQL 以及 SQLite3（仅限二进制版本）
 

gogs.go

@@ -19,7 +19,7 @@ import (
 // Test that go1.2 tag above is included in builds. main.go refers to this definition.
 const go12tag = true
 
-const APP_VER = "0.1.8.0326"
+const APP_VER = "0.1.8.0326 Alpha"
 
 func init() {
 	base.AppVer = APP_VER

models/repo.go

@@ -251,7 +251,8 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
 	}
 	defer pu.Close()
 	// TODO: Windows .bat
-	if _, err = pu.WriteString(fmt.Sprintf("#!/usr/bin/env bash\n%s update $1 $2 $3\n", appPath)); err != nil {
+	if _, err = pu.WriteString(fmt.Sprintf("#!/usr/bin/env bash\n%s update $1 $2 $3\n",
+		strings.Replace(appPath, "\\", "/", -1))); err != nil {
 		return err
 	}
 

modules/base/conf.go

@@ -80,7 +80,7 @@ func ExecDir() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return path.Dir(p), nil
+	return path.Dir(strings.Replace(p, "\\", "/", -1)), nil
 }
 
 var logLevels = map[string]string{

update.go

@@ -5,18 +5,18 @@
 package main
 
 import (
-"os"
-"os/exec"
-"strings"
-"strconv"
-"container/list"
+	"container/list"
+	"os"
+	"os/exec"
+	"strconv"
+	"strings"
 
-"github.com/codegangsta/cli"
-//"github.com/gogits/gogs/modules/log"
-"github.com/gogits/gogs/models"
-"github.com/gogits/gogs/modules/base"
-"github.com/qiniu/log"
-"github.com/gogits/git"
+	"github.com/codegangsta/cli"
+	//"github.com/gogits/gogs/modules/log"
+	"github.com/gogits/git"
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/base"
+	"github.com/qiniu/log"
 )
 
 var CmdUpdate = cli.Command{
@@ -103,7 +103,7 @@ func runUpdate(c *cli.Context) {
 	// if a new branch
 	if strings.HasPrefix(oldCommitId, "0000000") {
 		l, err = ref.AllCommits()
-		
+
 	} else {
 		l = ref.CommitsBetween(newCommit, oldCommit)
 	}