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

This commit is contained in:
skyblue 2014-03-26 21:26:54 +08:00
commit bffa6979b0
6 changed files with 18 additions and 17 deletions

View file

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

View file

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

View file

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

View file

@ -251,7 +251,8 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
} }
defer pu.Close() defer pu.Close()
// TODO: Windows .bat // 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 return err
} }

View file

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

View file

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