diff options
| author | evolvedlight <steve@evolvedlight.co.uk> | 2014-10-13 20:30:31 +0100 |
|---|---|---|
| committer | evolvedlight <steve@evolvedlight.co.uk> | 2014-10-13 20:30:31 +0100 |
| commit | 8d2a6fc484b540819e211d52b8d54e97269f0918 (patch) | |
| tree | e5bfe7d3937bb2d18ba2fb50ea72514bd5bb4e13 /models/models.go | |
| parent | 29ac3980ffdb5faa525d77fddc109c9023ebe257 (diff) | |
| parent | 89bd994c836ecc9b6ceb80849f470521e1b15917 (diff) | |
| download | gitea-8d2a6fc484b540819e211d52b8d54e97269f0918.tar.gz gitea-8d2a6fc484b540819e211d52b8d54e97269f0918.zip | |
Merge remote-tracking branch 'upstream/dev'
Conflicts:
models/repo.go
Diffstat (limited to 'models/models.go')
| -rw-r--r-- | models/models.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/models/models.go b/models/models.go index 60959c60e9..4dcc447b34 100644 --- a/models/models.go +++ b/models/models.go @@ -31,12 +31,12 @@ var ( ) func init() { - tables = append(tables, new(User), new(PublicKey), + tables = append(tables, new(User), new(PublicKey), new(Follow), new(Oauth2), new(Repository), new(Watch), new(Star), new(Action), new(Access), - new(Issue), new(Comment), new(Oauth2), new(Follow), - new(Mirror), new(Release), new(LoginSource), new(Webhook), new(IssueUser), - new(Milestone), new(Label), new(HookTask), new(Team), new(OrgUser), new(TeamUser), - new(UpdateTask), new(Attachment)) + new(Issue), new(Comment), new(Attachment), new(IssueUser), new(Label), new(Milestone), + new(Mirror), new(Release), new(LoginSource), new(Webhook), + new(UpdateTask), new(HookTask), new(Team), new(OrgUser), new(TeamUser), + new(Notice)) } func LoadModelsConfig() { |