aboutsummaryrefslogtreecommitdiff
path: root/routers/repo/pull.go
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-04-05 09:05:40 -0400
committerUnknwon <u@gogs.io>2017-04-05 09:05:40 -0400
commit6fbb984ebf4f0d6804f0f83e6edb12ef0bb9a570 (patch)
tree81f08210cb3553370795ec11c731d37bb3590122 /routers/repo/pull.go
parentba151eda0a8b6eec2cb45f01fcbc8aef7ad5a06f (diff)
Refactoring: rename pkg/base -> pkg/tool
Diffstat (limited to 'routers/repo/pull.go')
-rw-r--r--routers/repo/pull.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 987e703c..fc1a3817 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -16,17 +16,17 @@ import (
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/tool"
"github.com/gogits/gogs/pkg/context"
"github.com/gogits/gogs/pkg/form"
"github.com/gogits/gogs/pkg/setting"
)
const (
- FORK base.TplName = "repo/pulls/fork"
- COMPARE_PULL base.TplName = "repo/pulls/compare"
- PULL_COMMITS base.TplName = "repo/pulls/commits"
- PULL_FILES base.TplName = "repo/pulls/files"
+ FORK tool.TplName = "repo/pulls/fork"
+ COMPARE_PULL tool.TplName = "repo/pulls/compare"
+ PULL_COMMITS tool.TplName = "repo/pulls/commits"
+ PULL_FILES tool.TplName = "repo/pulls/files"
PULL_REQUEST_TEMPLATE_KEY = "PullRequestTemplate"
)
@@ -738,7 +738,7 @@ func TriggerTask(ctx *context.Context) {
if ctx.Written() {
return
}
- if secret != base.EncodeMD5(owner.Salt) {
+ if secret != tool.EncodeMD5(owner.Salt) {
ctx.Error(404)
log.Trace("TriggerTask [%s/%s]: invalid secret", owner.Name, repo.Name)
return