Merge branch 'master' into mssql-test

docs/static/_headers

@@ -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-Xss-Protection: 1; mode=block
   X-Content-Type-Options: nosniff

models/migrations/v64.go

@@ -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 {
 		return err
 	}

models/migrations/v69.go

@@ -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 {
 		return err
 	}

public/swagger.v1.json

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

routers/api/v1/repo/issue_comment.go

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