peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into mssql-test

Browse Source
This commit is contained in:
techknowlogick 2018-07-13 11:21:09 -04:00 committed by GitHub
commit d1907f91be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/static/_headers vendored
View File

@ -1,5 +1,5 @@
/* /*
Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' https://fonts.googleapis.com https://cdnjs.cloudflare.com; font-src 'self' https://fonts.googleapis.com https://cdnjs.cloudflare.com https://fonts.gstatic.com Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' https://fonts.googleapis.com https://cdnjs.cloudflare.com; font-src 'self' data: https://cdnjs.cloudflare.com https://fonts.gstatic.com
X-Frame-Options: DENY X-Frame-Options: DENY
X-Xss-Protection: 1; mode=block X-Xss-Protection: 1; mode=block
X-Content-Type-Options: nosniff X-Content-Type-Options: nosniff

8
models/migrations/v64.go
View File

@ -120,6 +120,14 @@ func addMultipleAssignees(x *xorm.Engine) error {
} }
} }
// Commit and begin new transaction for dropping columns
if err := sess.Commit(); err != nil {
return err
}
if err := sess.Begin(); err != nil {
return err
}
if err := dropTableColumns(sess, "issue", "assignee_id"); err != nil { if err := dropTableColumns(sess, "issue", "assignee_id"); err != nil {
return err return err
} }

8
models/migrations/v69.go
View File

@ -73,6 +73,14 @@ func moveTeamUnitsToTeamUnitTable(x *xorm.Engine) error {
} }
} }
// Commit and begin new transaction for dropping columns
if err := sess.Commit(); err != nil {
return err
}
if err := sess.Begin(); err != nil {
return err
}
if err := dropTableColumns(sess, "team", "unit_types"); err != nil { if err := dropTableColumns(sess, "team", "unit_types"); err != nil {
return err return err
} }

4
public/swagger.v1.json vendored
View File

@ -1847,7 +1847,7 @@
{ {
"type": "string", "type": "string",
"description": "if provided, only comments updated since the provided time are returned.", "description": "if provided, only comments updated since the provided time are returned.",
"name": "string", "name": "since",
"in": "query" "in": "query"
} }
], ],
@ -2160,7 +2160,7 @@
{ {
"type": "string", "type": "string",
"description": "if provided, only comments updated since the specified time are returned.", "description": "if provided, only comments updated since the specified time are returned.",
"name": "string", "name": "since",
"in": "query" "in": "query"
} }
], ],

4
routers/api/v1/repo/issue_comment.go
View File

@ -36,7 +36,7 @@ func ListIssueComments(ctx *context.APIContext) {
// description: index of the issue // description: index of the issue
// type: integer // type: integer
// required: true // required: true
// - name: string // - name: since
// in: query // in: query
// description: if provided, only comments updated since the specified time are returned. // description: if provided, only comments updated since the specified time are returned.
// type: string // type: string
@ -90,7 +90,7 @@ func ListRepoIssueComments(ctx *context.APIContext) {
// description: name of the repo // description: name of the repo
// type: string // type: string
// required: true // required: true
// - name: string // - name: since
// in: query // in: query
// description: if provided, only comments updated since the provided time are returned. // description: if provided, only comments updated since the provided time are returned.
// type: string // type: string