diff options
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/models/pull.go b/models/pull.go index de188c09..43211ed7 100644 --- a/models/pull.go +++ b/models/pull.go @@ -15,13 +15,13 @@ import ( "github.com/go-xorm/xorm" log "gopkg.in/clog.v1" - "github.com/gogits/git-module" - api "github.com/gogits/go-gogs-client" + "github.com/gogs/git-module" + api "github.com/gogs/go-gogs-client" - "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/pkg/process" - "github.com/gogits/gogs/pkg/setting" - "github.com/gogits/gogs/pkg/sync" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/process" + "github.com/gogs/gogs/pkg/setting" + "github.com/gogs/gogs/pkg/sync" ) var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength) @@ -48,13 +48,13 @@ type PullRequest struct { Status PullRequestStatus IssueID int64 `xorm:"INDEX"` - Issue *Issue `xorm:"-"` + Issue *Issue `xorm:"-" json:"-"` Index int64 HeadRepoID int64 - HeadRepo *Repository `xorm:"-"` + HeadRepo *Repository `xorm:"-" json:"-"` BaseRepoID int64 - BaseRepo *Repository `xorm:"-"` + BaseRepo *Repository `xorm:"-" json:"-"` HeadUserName string HeadBranch string BaseBranch string @@ -63,8 +63,8 @@ type PullRequest struct { HasMerged bool MergedCommitID string `xorm:"VARCHAR(40)"` MergerID int64 - Merger *User `xorm:"-"` - Merged time.Time `xorm:"-"` + Merger *User `xorm:"-" json:"-"` + Merged time.Time `xorm:"-" json:"-"` MergedUnix int64 } |