lianguan/gitea
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Golint fixed for modules/setting (#262)

Browse Source 
* golint fixed for modules/setting

* typo fixed and renamed UNIXSOCKET to UnixSocket
This commit is contained in:
Lunny Xiao
2016-11-27 18:14:25 +08:00
committed by GitHub
parent 0a76d260fa
commit 94da472717
38 changed files with 178 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
models/pull.go
View File

@ -317,7 +317,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
Ref: git.BRANCH_PREFIX + pr.BaseBranch,
Before: pr.MergeBase,
After: pr.MergedCommitID,
CompareURL: setting.AppUrl + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
CompareURL: setting.AppURL + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
Commits: ListToPushCommits(l).ToAPIPayloadCommits(pr.BaseRepo.HTMLURL()),
Repo: pr.BaseRepo.APIFormat(nil),
Pusher: pr.HeadRepo.MustOwner().APIFormat(),