coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of github.com:gogits/gogs into dev

This commit is contained in:
Unknwon 2014-12-31 17:09:07 +08:00
parent 0f1ff9b1ad 52cc58fd9d
commit e1c5008238
8 changed files with 93 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/blocks/docker_gogs/Dockerfile
View File

@ -46,7 +46,7 @@ ENV HOME /home/git
ENV USER git ENV USER git
ENV PATH $GOGS_PATH:$PATH ENV PATH $GOGS_PATH:$PATH
RUN git config --global user.name "GoGS" RUN git config --global user.name "GoGS" && git config --global user.email "gogitservice@gmail.com"
ENTRYPOINT ["/tmp/init_gogs.sh"] ENTRYPOINT ["/tmp/init_gogs.sh"]
CMD ["gogs", "web"] CMD ["gogs", "web"]

2
docker/blocks/docker_gogs_dev/Dockerfile
View File

@ -47,7 +47,7 @@ ENV HOME /home/git
ENV USER git ENV USER git
ENV PATH $GOGS_PATH:$PATH ENV PATH $GOGS_PATH:$PATH
RUN git config --global user.name "GoGS" RUN git config --global user.name "GoGS" && git config --global user.email "gogitservice@gmail.com"
ENTRYPOINT ["/tmp/init_gogs.sh"] ENTRYPOINT ["/tmp/init_gogs.sh"]
CMD ["gogs", "web"] CMD ["gogs", "web"]

4
models/issue.go
View File

@ -472,8 +472,8 @@ func UpdateIssueUserPairByAssignee(aid, iid int64) error {
if aid == 0 { if aid == 0 {
return nil return nil
} }
rawSql = "UPDATE `issue_user` SET is_assigned = true WHERE uid = ? AND issue_id = ?" rawSql = "UPDATE `issue_user` SET is_assigned = ? WHERE uid = ? AND issue_id = ?"
_, err := x.Exec(rawSql, aid, iid) _, err := x.Exec(rawSql, true, aid, iid)
return err return err
} }

21
models/repo.go
View File

@ -105,21 +105,18 @@ func NewRepoContext() {
log.Fatal(4, "Gogs requires Git version greater or equal to 1.7.1") log.Fatal(4, "Gogs requires Git version greater or equal to 1.7.1")
} }
// Check if server has basic git setting and set if not. // Check if server has user.email and user.name set correctly and set if they're not.
if stdout, stderr, err := process.Exec("NewRepoContext(get setting)", "git", "config", "--get", "user.name"); err != nil || strings.TrimSpace(stdout) == "" { for configKey, defaultValue := range map[string]string{"user.name": "Gogs", "user.email": "gogitservice@gmail.com"} {
// ExitError indicates user.name is not set if stdout, stderr, err := process.Exec("NewRepoContext(get setting)", "git", "config", "--get", configKey); err != nil || strings.TrimSpace(stdout) == "" {
// ExitError indicates this config is not set
if _, ok := err.(*exec.ExitError); ok || strings.TrimSpace(stdout) == "" { if _, ok := err.(*exec.ExitError); ok || strings.TrimSpace(stdout) == "" {
stndrdUserName := "Gogs" if _, stderr, gerr := process.Exec("NewRepoContext(set "+configKey+")", "git", "config", "--global", configKey, defaultValue); gerr != nil {
stndrdUserEmail := "gogitservice@gmail.com" log.Fatal(4, "Fail to set git %s(%s): %s", configKey, gerr, stderr)
if _, stderr, gerr := process.Exec("NewRepoContext(set name)", "git", "config", "--global", "user.name", stndrdUserName); gerr != nil {
log.Fatal(4, "Fail to set git user.name(%s): %s", gerr, stderr)
} }
if _, stderr, gerr := process.Exec("NewRepoContext(set email)", "git", "config", "--global", "user.email", stndrdUserEmail); gerr != nil { log.Info("Git config %s set to %s", configKey, defaultValue)
log.Fatal(4, "Fail to set git user.email(%s): %s", gerr, stderr)
}
log.Info("Git user.name and user.email set to %s <%s>", stndrdUserName, stndrdUserEmail)
} else { } else {
log.Fatal(4, "Fail to get git user.name(%s): %s", err, stderr) log.Fatal(4, "Fail to get git %s(%s): %s", configKey, err, stderr)
}
} }
} }

3
routers/repo/setting.go
View File

@ -10,6 +10,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"time" "time"
"path"
"github.com/Unknwon/com" "github.com/Unknwon/com"
@ -169,7 +170,7 @@ func SettingsCollaboration(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Tr("repo.settings") ctx.Data["Title"] = ctx.Tr("repo.settings")
ctx.Data["PageIsSettingsCollaboration"] = true ctx.Data["PageIsSettingsCollaboration"] = true
repoLink := strings.TrimPrefix(ctx.Repo.RepoLink, "/") repoLink := path.Join(ctx.Repo.Owner.LowerName, ctx.Repo.Repository.LowerName)
if ctx.Req.Method == "POST" { if ctx.Req.Method == "POST" {
name := strings.ToLower(ctx.Query("collaborator")) name := strings.ToLower(ctx.Query("collaborator"))

42
scripts/build.sh
View File

@ -1,21 +1,25 @@
rm -rf output outPath=./output
mkdir output
rm -rf $outPath
mkdir $outPath
go build ../gogs.go go build ../gogs.go
chmod +x gogs chmod +x gogs
mv gogs ./output/ mv gogs $outPath/
cp -r ../conf/ ./output/conf/
cp -r ../custom/ ./output/custom/ cp -r ../conf/ $outPath/conf/
cp -r ./dockerfiles/ ./output/dockerfiles/ cp -r ../custom/ $outPath/custom/
cp -r ../public/ ./output/public/ cp -r dockerfiles/ $outPath/dockerfiles/
cp -r ../templates/ ./output/templates/ cp -r ../public/ $outPath/public/
cp ../cert.pem ./output/ cp -r ../templates/ $outPath/templates/
cp ../CONTRIBUTING.md ./output/ cp ../cert.pem $outPath/
cp gogs_supervisord.sh ./output/ cp ../CONTRIBUTING.md $outPath/
cp ../key.pem ./output/ cp gogs_supervisord.sh $outPath/
cp ../LICENSE ./output/ cp ../key.pem $outPath/
cp ../README.md ./output/ cp ../LICENSE $outPath/
cp ../README_ZH.md ./output/ cp ../README.md $outPath/
cp start.bat ./output/ cp ../README_ZH.md $outPath/
cp start.sh ./output/ cp start.bat $outPath/
cp ../wercker.yml ./output/ cp start.sh $outPath/
cp mysql.sql ./output/ cp ../wercker.yml $outPath/
cp mysql.sql $outPath/

27
scripts/build_freebsd.sh Executable file
View File

@ -0,0 +1,27 @@
outPlattform=freebsd
outArch=amd64
outPath=./output_$outPlattform_$outArch
rm -rf $outPath
mkdir $outPath
CGO_ENABLED=0 GOOS=$outPlattform GOARCH=$outArch go build ../gogs.go
chmod +x gogs
mv gogs $outPath/
cp -r ../conf/ $outPath/conf/
cp -r ../custom/ $outPath/custom/
cp -r dockerfiles/ $outPath/dockerfiles/
cp -r ../public/ $outPath/public/
cp -r ../templates/ $outPath/templates/
cp ../cert.pem $outPath/
cp ../CONTRIBUTING.md $outPath/
cp gogs_supervisord.sh $outPath/
cp ../key.pem $outPath/
cp ../LICENSE $outPath/
cp ../README.md $outPath/
cp ../README_ZH.md $outPath/
cp start.bat $outPath/
cp start.sh $outPath/
cp ../wercker.yml $outPath/
cp mysql.sql $outPath/

46
scripts/build_linux64.sh
View File

@ -1,21 +1,27 @@
rm -rf output_linux_64 outPlattform=linux
mkdir output_linux_64 outArch=amd64
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ../gogs.go outPath=./output_$outPlattform_$outArch
rm -rf $outPath
mkdir $outPath
CGO_ENABLED=0 GOOS=$outPlattform GOARCH=$outArch go build ../gogs.go
chmod +x gogs chmod +x gogs
mv gogs ./output_linux_64/ mv gogs $outPath/
cp -r ../conf/ ./output_linux_64/conf/
cp -r ../custom/ ./output_linux_64/custom/ cp -r ../conf/ $outPath/conf/
cp -r dockerfiles/ ./output_linux_64/dockerfiles/ cp -r ../custom/ $outPath/custom/
cp -r ../public/ ./output_linux_64/public/ cp -r dockerfiles/ $outPath/dockerfiles/
cp -r ../templates/ ./output_linux_64/templates/ cp -r ../public/ $outPath/public/
cp ../cert.pem ./output_linux_64/ cp -r ../templates/ $outPath/templates/
cp ../CONTRIBUTING.md ./output_linux_64/ cp ../cert.pem $outPath/
cp gogs_supervisord.sh ./output_linux_64/ cp ../CONTRIBUTING.md $outPath/
cp ../key.pem ./output_linux_64/ cp gogs_supervisord.sh $outPath/
cp ../LICENSE ./output_linux_64/ cp ../key.pem $outPath/
cp ../README.md ./output_linux_64/ cp ../LICENSE $outPath/
cp ../README_ZH.md ./output_linux_64/ cp ../README.md $outPath/
cp start.bat ./output_linux_64/ cp ../README_ZH.md $outPath/
cp start.sh ./output_linux_64/ cp start.bat $outPath/
cp ../wercker.yml ./output_linux_64/ cp start.sh $outPath/
cp mysql.sql ./output_linux_64/ cp ../wercker.yml $outPath/
cp mysql.sql $outPath/