aboutsummaryrefslogtreecommitdiffstats
path: root/modules/context
diff options
context:
space:
mode:
Diffstat (limited to 'modules/context')
-rw-r--r--modules/context/context.go3
-rw-r--r--modules/context/pagination.go2
-rw-r--r--modules/context/repo.go14
3 files changed, 8 insertions, 11 deletions
diff --git a/modules/context/context.go b/modules/context/context.go
index 1699d7aecc..b7c77ac460 100644
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -130,7 +130,6 @@ func (ctx *Context) RedirectToFirst(location ...string) {
}
ctx.Redirect(setting.AppSubURL + "/")
- return
}
// HTML calls Context.HTML and converts template name to string.
@@ -266,7 +265,7 @@ func Contexter() macaron.Handler {
}
c.Header().Set("Content-Type", "text/html")
c.WriteHeader(http.StatusOK)
- c.Write([]byte(com.Expand(`<!doctype html>
+ _, _ = c.Write([]byte(com.Expand(`<!doctype html>
<html>
<head>
<meta name="go-import" content="{GoGetImport} git {CloneLink}">
diff --git a/modules/context/pagination.go b/modules/context/pagination.go
index 4795f650fb..390b4dbdd7 100644
--- a/modules/context/pagination.go
+++ b/modules/context/pagination.go
@@ -39,7 +39,7 @@ func (p *Pagination) AddParam(ctx *Context, paramKey string, ctxKey string) {
// GetParams returns the configured URL params
func (p *Pagination) GetParams() template.URL {
- return template.URL(strings.Join(p.urlParams[:], "&"))
+ return template.URL(strings.Join(p.urlParams, "&"))
}
// SetDefaultParams sets common pagination params that are often used
diff --git a/modules/context/repo.go b/modules/context/repo.go
index 0908340879..096f3c0a5d 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -455,15 +455,13 @@ func RepoAssignment() macaron.Handler {
ctx.Repo.PullRequest.BaseRepo = repo.BaseRepo
ctx.Repo.PullRequest.Allowed = true
ctx.Repo.PullRequest.HeadInfo = ctx.Repo.Owner.Name + ":" + ctx.Repo.BranchName
- } else {
+ } else if repo.AllowsPulls() {
// Or, this is repository accepts pull requests between branches.
- if repo.AllowsPulls() {
- ctx.Data["BaseRepo"] = repo
- ctx.Repo.PullRequest.BaseRepo = repo
- ctx.Repo.PullRequest.Allowed = true
- ctx.Repo.PullRequest.SameRepo = true
- ctx.Repo.PullRequest.HeadInfo = ctx.Repo.BranchName
- }
+ ctx.Data["BaseRepo"] = repo
+ ctx.Repo.PullRequest.BaseRepo = repo
+ ctx.Repo.PullRequest.Allowed = true
+ ctx.Repo.PullRequest.SameRepo = true
+ ctx.Repo.PullRequest.HeadInfo = ctx.Repo.BranchName
}
}
ctx.Data["PullRequestCtx"] = ctx.Repo.PullRequest