rebase, resolve conflicts

Marco Napetti · Marco Napetti · commit f86c31f8d51c · 2023-02-03T15:41:24.000+01:00
diff --git a/src/controllers/krate/metadata.rs b/src/controllers/krate/metadata.rs
@@ -339,7 +339,7 @@ pub async fn versions(
                 .select((versions::all_columns, users::all_columns.nullable()))
                 .order(versions::created_at.desc())
                 .pages_pagination(pagination_options)
-                .load(&*conn)?;
+                .load(&conn)?;
             let more = data.next_page_params().is_some();
 
             (

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ pub async fn versions(`
`339`	`339`	`.select((versions::all_columns, users::all_columns.nullable()))`
`340`	`340`	`.order(versions::created_at.desc())`
`341`	`341`	`.pages_pagination(pagination_options)`
`342`		`- .load(&*conn)?;`
	`342`	`+ .load(&conn)?;`
`343`	`343`	`let more = data.next_page_params().is_some();`
`344`	`344`
`345`	`345`	`(`