summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2016-08-14 04:17:26 -0700
committerUnknwon <u@gogs.io>2016-08-14 04:17:26 -0700
commitdccb0c15b996ac4dc0307cbfed140ce1558d7e3c (patch)
tree97593eae3a1023296c2c03258e6bc4ae4c02b6bf /cmd
parent3f7f4852efaaa56a0dada832dc652a1fc8869ae7 (diff)
downloadgitea-dccb0c15b996ac4dc0307cbfed140ce1558d7e3c.tar.gz
gitea-dccb0c15b996ac4dc0307cbfed140ce1558d7e3c.zip
Replace convert.To with APIFormat calls
Diffstat (limited to 'cmd')
-rw-r--r--cmd/serve.go3
-rw-r--r--cmd/web.go2
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/serve.go b/cmd/serve.go
index a7503ca9b6..e55da77441 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -15,6 +15,7 @@ import (
"github.com/Unknwon/com"
"github.com/codegangsta/cli"
+ git "github.com/gogits/git-module"
gouuid "github.com/satori/go.uuid"
"github.com/gogits/gogs/models"
@@ -113,7 +114,7 @@ func handleUpdateTask(uuid string, user, repoUser *models.User, reponame string,
// Ask for running deliver hook and test pull request tasks.
reqURL := setting.LocalURL + repoUser.Name + "/" + reponame + "/tasks/trigger?branch=" +
- strings.TrimPrefix(task.RefName, "refs/heads/") + "&secret=" + base.EncodeMD5(repoUser.Salt) + "&pusher=" + com.ToStr(user.ID)
+ strings.TrimPrefix(task.RefName, git.BRANCH_PREFIX) + "&secret=" + base.EncodeMD5(repoUser.Salt) + "&pusher=" + com.ToStr(user.ID)
log.GitLogger.Trace("Trigger task: %s", reqURL)
resp, err := httplib.Head(reqURL).SetTLSClientConfig(&tls.Config{
diff --git a/cmd/web.go b/cmd/web.go
index ed45bdc060..bf027958b7 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -89,7 +89,7 @@ func checkVersion() {
{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
{"github.com/gogits/git-module", git.Version, "0.3.5"},
- {"github.com/gogits/go-gogs-client", gogs.Version, "0.10.4"},
+ {"github.com/gogits/go-gogs-client", gogs.Version, "0.12.0"},
}
for _, c := range checkers {
if !version.Compare(c.Version(), c.Expected, ">=") {