summaryrefslogtreecommitdiffstats
path: root/models/pull.go
diff options
context:
space:
mode:
authorKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2016-11-29 09:25:47 +0100
committerKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2016-11-29 11:50:22 +0100
commit42ec5ce740fdd646755ca38ea5ce20f6cc7dc6b1 (patch)
tree125a480f9643570c92dd2859ba3bfc6d2b39b31d /models/pull.go
parentdad806d3ea0da6a09eea14ac467d0c843a98dda4 (diff)
downloadgitea-42ec5ce740fdd646755ca38ea5ce20f6cc7dc6b1.tar.gz
gitea-42ec5ce740fdd646755ca38ea5ce20f6cc7dc6b1.zip
Fix breakage from vendor-update
Diffstat (limited to 'models/pull.go')
-rw-r--r--models/pull.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go
index f2eb895960..f1b92bff58 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -139,7 +139,7 @@ func (pr *PullRequest) APIFormat() *api.PullRequest {
if pr.Status != PullRequestStatusChecking {
mergeable := pr.Status != PullRequestStatusConflict
- apiPullRequest.Mergeable = &mergeable
+ apiPullRequest.Mergeable = mergeable
}
if pr.HasMerged {
apiPullRequest.Merged = &pr.Merged