Merge branch 'master' into setup-script

2018-06-19 22:26:31 +01:00
parent 554deb3ec0 8ab25b1ca2
commit 635ac6cf42
10 changed files with 109 additions and 91 deletions
@@ -52,7 +52,7 @@ pub struct NewPost {
 impl Post {
    insert!(posts, NewPost);
    get!(posts);
-    find_by!(posts, find_by_slug, slug as String);
+    find_by!(posts, find_by_slug, slug as String, blog_id as i32);
    find_by!(posts, find_by_ap_url, ap_url as String);

    pub fn count_local(conn: &PgConnection) -> usize {