diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2016-12-22 17:30:52 +0800 |
|---|---|---|
| committer | Thomas Boerger <thomas@webhippie.de> | 2016-12-22 10:30:52 +0100 |
| commit | 47a7529d9655e11471bbe39958222a13854a6133 (patch) | |
| tree | 98e597255245e17d39a0062c3977fb8a510cf413 /models/pull.go | |
| parent | 0c5c34d7ddaf31a6d8123dac36b221de61f5ff96 (diff) | |
| download | gitea-47a7529d9655e11471bbe39958222a13854a6133.tar.gz gitea-47a7529d9655e11471bbe39958222a13854a6133.zip | |
update code.gitea.io/git (#450)
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index 40e40894a9..9aec3596d4 100644 --- a/models/pull.go +++ b/models/pull.go @@ -380,7 +380,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error l.PushFront(mergeCommit) p := &api.PushPayload{ - Ref: git.BRANCH_PREFIX + pr.BaseBranch, + Ref: git.BranchPrefix + pr.BaseBranch, Before: pr.MergeBase, After: pr.MergedCommitID, CompareURL: setting.AppURL + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID), |